diff --git a/ChangeLog b/ChangeLog
index ac117770e6..f9260148ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-01  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/playback/gstplaybasebin.c: (gst_play_base_bin_change_state):
+	  Don't crash on EMPTY caps (e.g. when the demuxer didn't recognize
+	  the contained stream).
+
 2004-12-01  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/faad/gstfaad.c: (gst_faad_srcconnect), (gst_faad_chain):
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 59e67a401e..63522e6ac8 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -1207,7 +1207,7 @@ gst_play_base_bin_change_state (GstElement * element)
             /* We're no audio/video and the only stream... We could
              * be something not-media that's detected because then our
              * typefind doesn't mess up with mp3 (bz2, gz, elf, ...) */
-            if (info->caps) {
+            if (info->caps && !gst_caps_is_empty (info->caps)) {
               const gchar *mime =
                   gst_structure_get_name (gst_caps_get_structure (info->caps,
                       0));