diff --git a/ChangeLog b/ChangeLog
index 1fc2c067c..dd758b35f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-26  Alexander Larsson  <alexl@redhat.com>
+
+	* src/file-manager/fm-directory-view.c (add_submenu):
+	Don't ref pixbuf if it is NULL
+
 2009-02-25  Alexander Larsson  <alexl@redhat.com>
 
 	* libnautilus-private/nautilus-file-operations.c (copy_files):
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 5024283d2..3e6fb90b1 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -4212,9 +4212,11 @@ add_submenu (GtkUIManager *ui_manager,
 						 escaped_label,
 						 NULL,
 						 NULL);
-			g_object_set_data_full (G_OBJECT (action), "menu-icon",
-						g_object_ref (pixbuf),
-						g_object_unref);
+			if (pixbuf != NULL) {
+				g_object_set_data_full (G_OBJECT (action), "menu-icon",
+							g_object_ref (pixbuf),
+							g_object_unref);
+			}
 			
 			g_object_set (action, "hide-if-empty", FALSE, NULL);