diff --git a/ChangeLog b/ChangeLog
index ac6672dcae..ec40da0a99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-06  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/gstelement.c: (gst_element_change_state):
+	  Well, actually, I was about to remove this insane assert when
+	  I noticed Wim already did that. A warning is nice so we can
+	  fix actual ugs (using --g-fatal-warnings and backtraces), so
+	  I added that instead.
+
 2004-09-06  Wim Taymans  <wim@fluendo.com>
 
 	* gst/gstelement.c: (gst_element_threadsafe_properties_pre_run),
diff --git a/gst/gstelement.c b/gst/gstelement.c
index f44b7d803a..6bc8df9498 100644
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -3014,6 +3014,9 @@ gst_element_change_state (GstElement * element)
        * - a new state was added
        * - somehow the element was asked to jump across an intermediate state
        */
+      g_warning ("Unhandled state change from %s to %s",
+          gst_element_state_get_name (old_state),
+          gst_element_state_get_name (old_pending));
       break;
   }