diff --git a/ChangeLog b/ChangeLog
index 95135d1e47b52704af8f8dc9316cca63b506a4d4..f4a09d45945ddede425211ecb98f6075c46f76c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-10  Julien MOUTTE <julien@moutte.net>
+
+	* gst/gstevent.c: (_gst_event_free): Sometimes a tag event arrives but
+	the structure does not contain a valid tag list. Adding a safety check
+	to remove a noisy warning in that case.
+
 2004-02-10  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gst.c: fix name to be in line with others
diff --git a/gst/gstevent.c b/gst/gstevent.c
index a3301e8c9dddf8492519311963e68c42a638e486..f5a842b840ec4e892432d3984d86064ac00ee629 100644
--- a/gst/gstevent.c
+++ b/gst/gstevent.c
@@ -92,7 +92,8 @@ _gst_event_free (GstEvent* event)
   }
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_TAG:
-      gst_tag_list_free (event->event_data.structure.structure);
+      if (GST_IS_TAG_LIST (event->event_data.structure.structure))
+        gst_tag_list_free (event->event_data.structure.structure);
       break;
     case GST_EVENT_NAVIGATION:
       gst_structure_free (event->event_data.structure.structure);