diff --git a/ChangeLog b/ChangeLog
index 1f17fd2a1c..3b69a40e36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-04  Zeeshan Ali  <zeenix@gmail.com>
+
+	* gst-libs/gst/rtp/gstbasertpdepayload.c:
+	(gst_base_rtp_depayload_class_init), (gst_base_rtp_depayload_wait):
+	Fixed a small problem.
+
 2005-11-04  Wim Taymans  <wim@fluendo.com>
 
 	* examples/seeking/Makefile.am:
diff --git a/gst-libs/gst/rtp/gstbasertpdepayload.c b/gst-libs/gst/rtp/gstbasertpdepayload.c
index 576695e2a7..02b37c8ff3 100644
--- a/gst-libs/gst/rtp/gstbasertpdepayload.c
+++ b/gst-libs/gst/rtp/gstbasertpdepayload.c
@@ -399,8 +399,11 @@ gst_base_rtp_depayload_wait (GstBaseRTPDepayload * filter, GstClockTime time)
 {
   GstClockID id;
 
-  g_return_if_fail (filter->clock != NULL);
   g_return_if_fail (GST_CLOCK_TIME_IS_VALID (time));
+  if (filter->clock == NULL) {
+    GST_DEBUG_OBJECT (filter, "No clock given yet");
+    return;
+  }
 
   id = gst_clock_new_single_shot_id (filter->clock, time);