diff --git a/ChangeLog b/ChangeLog
index c3c9b50303..82c86bbdd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-09  Sebastien Cote  <sc5@hermes.usherb.ca>
+
+	Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/auparse/gstauparse.c: (gst_auparse_chain):
+	  Error out on invalid data (fixes #154807).
+
 2004-10-09  Tim-Philipp Müller  <t.i.m@zen.co.uk>
 
 	Reviewed by: Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c
index a9a764f385..9b84db0c56 100644
--- a/gst/auparse/gstauparse.c
+++ b/gst/auparse/gstauparse.c
@@ -221,7 +221,7 @@ gst_auparse_chain (GstPad * pad, GstData * _data)
       head++;
 
     } else {
-      g_warning ("help, dunno what I'm looking at!\n");
+      GST_ELEMENT_ERROR (auparse, STREAM, WRONG_TYPE, (NULL), (NULL));
       gst_buffer_unref (buf);
       return;
     }