diff --git a/ChangeLog b/ChangeLog
index 531dc2ffdb..d9a1528ba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-10  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/playback/gstplaybasebin.c: (gst_play_base_bin_change_state):
+	  Don't assert (#157853).
+
 2004-11-10  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event),
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 300e393995..246eb73392 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -1069,15 +1069,11 @@ gst_play_base_bin_change_state (GstElement * element)
 
         group = get_active_group (play_base_bin);
 
-        /* FIXME for now...  The group can be NULL if the setup_source
-         * function somehow returned TRUE but did not commit the group. 
-         * Actually I don't think this can happen but need to recheck. */
-        g_assert (group);
-
         /* check if we found any supported stream... if not, then
          * we detected stream type (or the above would've failed),
          * but linking/decoding failed - plugin probably missing. */
-        for (item = group->streaminfo; item != NULL; item = item->next) {
+        for (item = group ? group->streaminfo : NULL;
+            item != NULL; item = item->next) {
           GstStreamInfo *info = GST_STREAM_INFO (item->data);
 
           if (info->type != GST_STREAM_TYPE_UNKNOWN) {