diff --git a/ChangeLog b/ChangeLog
index ff05af7c8a..8785e6b2c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-28  Edward Hervey  <bilboed@bilboed.com>
+
+	Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/gstvalue.c: (gst_string_wrap):
+	  Allow NULL-strings as argument (#165365).
+
 2005-01-27  Stephane Wirtel  <stephane.wirtel@belgacom.net>
 
 	Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index c1dedde122..03e80beeb7 100644
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -1241,6 +1241,8 @@ gst_string_wrap (const char *s)
 
   len = 0;
   t = s;
+  if (!s)
+    return g_strdup ("");
   while (*t) {
     if (GST_ASCII_IS_STRING (*t)) {
       len++;