diff --git a/ChangeLog b/ChangeLog
index 6e588cd7c6..ff74c50dc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-14  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* gst/debug/gsttaginject.c: (gst_tag_inject_start):
+	Don't pass NULL taglists to gst_tag_list_is_empty().
+
 2008-07-14  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* tests/check/elements/cmmldec.c: (GST_START_TEST):
diff --git a/gst/debug/gsttaginject.c b/gst/debug/gsttaginject.c
index aee1227ff6..7e2b81c8f9 100644
--- a/gst/debug/gsttaginject.c
+++ b/gst/debug/gsttaginject.c
@@ -180,7 +180,7 @@ gst_tag_inject_start (GstBaseTransform * trans)
   GstTagInject *self = GST_TAG_INJECT (trans);
 
   /* send tags */
-  if (!gst_tag_list_is_empty (self->tags)) {
+  if (self->tags && !gst_tag_list_is_empty (self->tags)) {
     gst_element_found_tags (GST_ELEMENT (trans),
         gst_tag_list_copy (self->tags));
   }