diff --git a/ChangeLog b/ChangeLog
index 31e8c50c47..cb28f4ce95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-11-09  Christian F.K. Schaller  <set EMAIL_ADDRESS environment variable>
+2006-11-09  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/playback/gststreamselector.c: (gst_stream_selector_dispose):
+	  Don't unref a NULL pad.
+
+2006-11-09  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_submit_page),
 	(gst_ogg_demux_get_prev_page), (gst_ogg_demux_perform_seek),
diff --git a/gst/playback/gststreamselector.c b/gst/playback/gststreamselector.c
index b35b8169c0..2eaf31528b 100644
--- a/gst/playback/gststreamselector.c
+++ b/gst/playback/gststreamselector.c
@@ -167,7 +167,10 @@ gst_stream_selector_dispose (GObject * object)
 {
   GstStreamSelector *sel = GST_STREAM_SELECTOR (object);
 
-  gst_object_unref (sel->active_sinkpad);
+  if (sel->active_sinkpad) {
+    gst_object_unref (sel->active_sinkpad);
+    sel->active_sinkpad = NULL;
+  }
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }