diff --git a/ChangeLog b/ChangeLog
index 36288f10fd..287d92e994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-16  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_chain):
+          throw error when not negotiated instead of asserting
+
 2004-02-15  Julien MOUTTE  <julien@moutte.net>
 
 	* gst/switch/gstswitch.c: (gst_switch_loop): More fixes for 
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 6d6b9414ef..3ef509f0c2 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -216,7 +216,12 @@ gst_audio_convert_chain (GstPad *pad, GstData *data)
     return;
   }
 
-  g_assert (gst_pad_is_negotiated (this->sink));
+  if (!gst_pad_is_negotiated (this->sink))
+  {
+    GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL,
+                       ("Sink pad not negotiated before chain function"));
+    return;
+  }
   if (!gst_pad_is_negotiated (this->src)) {
     gst_data_unref (data);
     return;