diff --git a/ChangeLog b/ChangeLog
index 752c9a3955..4b639a11d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-01  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_sink_event):
+	  Post an error if we receive an EOS event while still waiting for the
+	  ASF header object to come through.
+
 2007-01-24  Tim-Philipp Müller  <tim at centricular dot net>
 
 	Patch by: Xavier B. <xavierb gmail com>
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 123e5dc0a4..4719bdc5f0 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -195,6 +195,12 @@ gst_asf_demux_sink_event (GstPad * pad, GstEvent * event)
     }
 
     case GST_EVENT_EOS:{
+      if (demux->state == GST_ASF_DEMUX_STATE_HEADER) {
+        GST_ELEMENT_ERROR (demux, STREAM, DEMUX,
+            (_("This stream contains no data.")),
+            ("got eos and didn't receive a complete header object"));
+        break;
+      }
       GST_OBJECT_LOCK (demux);
       gst_adapter_clear (demux->adapter);
       demux->bytes_needed = 0;