diff --git a/ChangeLog b/ChangeLog
index 17abfafd95..21dfe2f995 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-07  Ole André Vadla Ravnås  <ole.andre.ravnas at tandberg com>
+
+	* gst/rtp/gstrtph264pay.c (gst_rtp_h264_pay_parse_sps_pps):
+	  Use GST_STR_NULL when trying to print sps and pps strings that could
+	  be NULL, as this might crash on some platforms.
+
 2008-05-07  Ole André Vadla Ravnås  <ole.andre.ravnas at tandberg com>
 
 	patch by: Haakon Sporsheim <haakon.sporsheim at tandberg com>
diff --git a/gst/rtp/gstrtph264pay.c b/gst/rtp/gstrtph264pay.c
index ce806d9404..9938ed7b13 100644
--- a/gst/rtp/gstrtph264pay.c
+++ b/gst/rtp/gstrtph264pay.c
@@ -512,7 +512,7 @@ gst_rtp_h264_pay_parse_sps_pps (GstBaseRTPPayload * basepayload,
         "sprop-parameter-sets", G_TYPE_STRING, sprops, NULL);
 
     GST_DEBUG ("outcaps udpate: profile=%s, sps=%s, pps=%s\n",
-        profile, sps, pps);
+        profile, GST_STR_NULL (sps), GST_STR_NULL (pps));
 
     g_free (sprops);
     g_free (profile);