diff --git a/ChangeLog b/ChangeLog
index f7b3df21af..67093ea2dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-18  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
+	(gst_ffmpegcolorspace_chain):
+        throw error instead of g_critical (#137588)
+
 2004-03-18  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* Makefile.am:
diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
index 738ee4b913..6faf8f6151 100644
--- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c
+++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
@@ -306,7 +306,8 @@ gst_ffmpegcolorspace_chain (GstPad * pad, GstData * data)
   g_return_if_fail (GST_IS_FFMPEGCOLORSPACE (space));
 
   if (space->from_pixfmt == PIX_FMT_NB || space->to_pixfmt == PIX_FMT_NB) {
-    g_critical ("attempting to convert unknown formats");
+    GST_ELEMENT_ERROR (space, CORE, NOT_IMPLEMENTED, NULL,
+        ("attempting to convert colorspaces between unknown formats"));
     gst_buffer_unref (inbuf);
     return;
   }