diff --git a/ChangeLog b/ChangeLog
index 7f2f597026..e769a3cd0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-06  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* ext/taglib/gstid3v2mux.cc:
+	Don't attempt to write a NULL frame into the ID3 tag set when the 
+	createFrame method returned NULL.
+	Fixes: #381857
+	Patch by: Jonathan Matthew <jonathan at 0kaolin wh9 net >
+
 2006-12-06  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* gst/apetag/gstapedemux.c: (ape_demux_parse_tags):
diff --git a/ext/taglib/gstid3v2mux.cc b/ext/taglib/gstid3v2mux.cc
index a6dbd2b187..dc3b9d6cc2 100644
--- a/ext/taglib/gstid3v2mux.cc
+++ b/ext/taglib/gstid3v2mux.cc
@@ -381,7 +381,8 @@ add_id3v2frame_tag (ID3v2::Tag * id3v2tag, const GstTagList * list,
             GST_PTR_FORMAT, version, i, num_tags, GST_BUFFER_SIZE (buf), s);
 
         frame = factory->createFrame (bytes, (TagLib::uint) version);
-        id3v2tag->addFrame (frame);
+        if (frame)
+          id3v2tag->addFrame (frame);
       }
     }
   }