diff --git a/ChangeLog b/ChangeLog
index 2fdb23e447..db6450ec14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-07  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* gst/gstregistrybinary.c: (gst_registry_binary_read_cache):
+	Always destroy the timer, also in error cases.
+
 2007-09-05  Wim Taymans  <wim.taymans@gmail.com>
 
 	* docs/manual/highlevel-xml.xml:
diff --git a/common b/common
index cd25ca736b..7675278046 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit cd25ca736bc2446800de2180ad71fc1da858d324
+Subproject commit 76752780462a3c4da712d56d54c45402144b3d0f
diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c
index 672c1f6335..8a862183e0 100644
--- a/gst/gstregistrybinary.c
+++ b/gst/gstregistrybinary.c
@@ -887,6 +887,7 @@ gst_registry_binary_read_cache (GstRegistry * registry, const char *location)
     g_file_get_contents (location, &contents, &size, &err);
     if (err != NULL) {
       GST_INFO ("Unable to read file %s : %s", location, err->message);
+      g_timer_destroy (timer);
       g_error_free (err);
       return FALSE;
     }
@@ -935,7 +936,6 @@ gst_registry_binary_read_cache (GstRegistry * registry, const char *location)
 
   g_timer_stop (timer);
   seconds = g_timer_elapsed (timer, NULL);
-  g_timer_destroy (timer);
 
   GST_INFO ("loaded %s in %lf seconds", location, seconds);
 
@@ -943,6 +943,7 @@ gst_registry_binary_read_cache (GstRegistry * registry, const char *location)
   /* TODO: once we re-use the pointers to registry contents return here */
 
 Error:
+  g_timer_destroy (timer);
   if (mapped) {
     g_mapped_file_free (mapped);
   } else {