diff --git a/ChangeLog b/ChangeLog
index 6247bc2efe..02a04dd092 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-30  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/gstcaps.c: (gst_caps_from_string_inplace):
+          make sure we don't get NULL strings
+
 2004-03-30  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gstcaps.c:
diff --git a/gst/gstcaps.c b/gst/gstcaps.c
index 39be411385..ba492bf2e3 100644
--- a/gst/gstcaps.c
+++ b/gst/gstcaps.c
@@ -1129,6 +1129,7 @@ gst_caps_from_string_inplace (GstCaps * caps, const gchar * string)
   GstStructure *structure;
   gchar *s;
 
+  g_return_val_if_fail (string, FALSE);
   if (strcmp ("ANY", string) == 0) {
     caps->flags = GST_CAPS_FLAGS_ANY;
     return TRUE;