diff --git a/gio/ChangeLog b/gio/ChangeLog
index 7f0d6b296..ca1a3c1fe 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-30  Matthias Clasen  <mclasen@redhat.com> 
+
+	* gdesktopfileinfo.c (g_app_info_get_all): Don't include NULLs
+	in the list of returned app infos.
+
 2007-12-30  Matthias Clasen  <mclasen@redhat.com> 
 
 	* gappinfo.c: Fix a cross-reference
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index e622353e5..4433b1c7e 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -1722,7 +1722,10 @@ g_app_info_get_all (void)
   infos = NULL;
   g_hash_table_iter_init (&iter, apps);
   while (g_hash_table_iter_next (&iter, NULL, &value))
-    infos = g_list_prepend (infos, value);
+    {
+      if (value)
+        infos = g_list_prepend (infos, value);
+    }
 
   g_hash_table_destroy (apps);