diff --git a/ChangeLog b/ChangeLog
index 56e45997be..35b078ae96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-04  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst-libs/gst/cdda/gstcddabasesrc.c:
+	(gst_cdda_base_src_add_track):
+	  Fix build when disabling asserts.
+
 2007-05-03  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_new):
diff --git a/gst-libs/gst/cdda/gstcddabasesrc.c b/gst-libs/gst/cdda/gstcddabasesrc.c
index 661559e4a8..a4f93195f6 100644
--- a/gst-libs/gst/cdda/gstcddabasesrc.c
+++ b/gst-libs/gst/cdda/gstcddabasesrc.c
@@ -1025,7 +1025,10 @@ gst_cdda_base_src_add_track (GstCddaBaseSrc * src, GstCddaBaseSrcTrack * track)
   if (src->num_tracks > 0) {
     guint end_of_previous_track = src->tracks[src->num_tracks - 1].end;
 
-    g_return_val_if_fail (track->start >= end_of_previous_track, FALSE);
+    if (track->start >= end_of_previous_track) {
+      GST_WARNING ("track %2u overlaps with previous tracks", track->num);
+      return FALSE;
+    }
   }
 
   GST_OBJECT_LOCK (src);