diff --git a/ChangeLog b/ChangeLog
index 6277b2525c..90155d2e9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-08  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/vorbis/vorbisdec.c: (vorbis_dec_src_query):
+	  Check for pad availability before doing a query on it.
+
 2005-01-08  Stephane LOEUILLET  <stephane.loeuillet@tiscali.fr>
 
 	* ext/dv/gstdvdec.c:
diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c
index 67edc381da..9543ee593e 100644
--- a/ext/vorbis/vorbisdec.c
+++ b/ext/vorbis/vorbisdec.c
@@ -246,7 +246,7 @@ vorbis_dec_src_query (GstPad * pad, GstQueryType query, GstFormat * format,
     granulepos = dec->granulepos;
   } else {
     /* query peer in default format */
-    if (!dec->sinkpad ||
+    if (!dec->sinkpad || !GST_PAD_PEER (dec->sinkpad) ||
         !gst_pad_query (GST_PAD_PEER (dec->sinkpad), query, &my_format,
             &granulepos))
       return FALSE;