diff --git a/ChangeLog b/ChangeLog
index 26062d4392..d9282ed9c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-08  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/gstregistrybinary.c: (gst_registry_binary_write_cache):
+	If we can't get a cache file don't try to save something to it.
+	Dereferencing NULL pointers usually isn't a good idea.
+
 2008-10-07  Jan Schmidt - Sun Microsystems <jan.schmidt@sun.com>
 
 	* tests/check/Makefile.am:
diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c
index bb28f50d11..5285f4c6f6 100644
--- a/gst/gstregistrybinary.c
+++ b/gst/gstregistrybinary.c
@@ -838,7 +838,8 @@ fail_free_list:
     }
     g_list_free (to_write);
 
-    (void) gst_registry_binary_cache_finish (registry, cache, FALSE);
+    if (cache)
+      (void) gst_registry_binary_cache_finish (registry, cache, FALSE);
     /* fall through */
   }
 fail: