diff --git a/ChangeLog b/ChangeLog
index d1278e8b83..3d80cf143f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-27  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/flv/gstflvdemux.c: (gst_flv_demux_pull_tag):
+	Error out early if pulling a tag failed.
+
 2008-10-27  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* gst/flv/gstflvdemux.c: (gst_flv_demux_create_index),
diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c
index 6448d6a5da..afef17bdc5 100644
--- a/gst/flv/gstflvdemux.c
+++ b/gst/flv/gstflvdemux.c
@@ -354,6 +354,9 @@ gst_flv_demux_pull_tag (GstPad * pad, GstFLVDemux * demux)
 
   gst_buffer_unref (buffer);
 
+  if (G_UNLIKELY (ret != GST_FLOW_OK))
+    goto beach;
+
   /* Jump over tag type + size */
   demux->offset += FLV_TAG_TYPE_SIZE;