diff --git a/ChangeLog b/ChangeLog
index e1888f8508..14d9501f00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (get_icon_for_mime_type): Don't crash
+	if mime_type is NULL.  (#322998, Sadrul Habib Chowdhury)
+
 2005-12-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilesystemunix.c: Adapt to xdg API changes.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e1888f8508..14d9501f00 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c (get_icon_for_mime_type): Don't crash
+	if mime_type is NULL.  (#322998, Sadrul Habib Chowdhury)
+
 2005-12-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilesystemunix.c: Adapt to xdg API changes.
diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index 8d6e5501bd..7c851a05f7 100644
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -1284,6 +1284,9 @@ get_icon_for_mime_type (GtkWidget  *widget,
   GString *icon_name;
   GdkPixbuf *pixbuf;
 
+  if (!mime_type)
+    return NULL;
+
   separator = strchr (mime_type, '/');
   if (!separator)
     return NULL; /* maybe we should return a GError with "invalid MIME-type" */