diff --git a/ChangeLog b/ChangeLog
index 1f77d8aaf2..91962570a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-25  Wim Taymans  <wim@fluendo.com>
+
+	* tools/gst-launch.c: (event_loop):
+	Unref message after using its contents instead of
+	before.
+
 2005-05-24  Wim Taymans  <wim@fluendo.com>
 
 	* docs/design/draft-ghostpads.txt:
diff --git a/tools/gst-launch.c b/tools/gst-launch.c
index b363aea652..a5325f5f6d 100644
--- a/tools/gst-launch.c
+++ b/tools/gst-launch.c
@@ -381,8 +381,8 @@ event_loop (GstElement * pipeline, gboolean blocking)
         gchar *debug;
 
         gst_message_parse_error (message, &gerror, &debug);
-        gst_message_unref (message);
         gst_object_default_error (GST_MESSAGE_SRC (message), gerror, debug);
+        gst_message_unref (message);
         g_error_free (gerror);
         g_free (debug);
         return TRUE;