diff --git a/ChangeLog b/ChangeLog
index 0c1b9bec49..f49b82cdc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-27  Carlos Garnacho  <carlos@imendio.com>
+
+	* gtk/gtkrecentmanager.c (get_icon_for_mime_type): Fix two potential
+	critical warnings. Bug #539470.
+
 2008-06-27  Emmanuele Bassi  <ebassi@gnome.org>
 
 	Abstract some GdkWindow API into an interface that the backends
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index 1b24425384..fea41ad658 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -1889,15 +1889,22 @@ get_icon_for_mime_type (const char *mime_type,
   icon_theme = gtk_icon_theme_get_default ();
 
   content_type = g_content_type_from_mime_type (mime_type);
+
+  if (!content_type)
+    return NULL;
+
   icon = g_content_type_get_icon (content_type);
   info = gtk_icon_theme_lookup_by_gicon (icon_theme, 
                                          icon, 
                                          pixel_size, 
                                          GTK_ICON_LOOKUP_USE_BUILTIN);
-  pixbuf = gtk_icon_info_load_icon (info, NULL);
-
   g_free (content_type);
   g_object_unref (icon);
+
+  if (!info)
+    return NULL;
+
+  pixbuf = gtk_icon_info_load_icon (info, NULL);
   gtk_icon_info_free (info);
 
   return pixbuf;