diff --git a/ChangeLog b/ChangeLog
index 73b10402ba..5e72ee9efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-24  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/gstinfo.h:
+	  do not crash on pad==NULL
+
 2005-11-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	Patch by: Stefan Kost
diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index 97cdf2de6e..0897c2ff91 100644
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -185,9 +185,11 @@ struct _GstDebugCategory {
  * statements.
  */
 #define GST_DEBUG_PAD_NAME(pad) \
-  (GST_OBJECT_PARENT(pad) != NULL) ? \
+  (pad != NULL) ?  \
+  ((GST_OBJECT_PARENT(pad) != NULL) ? \
   GST_STR_NULL (GST_OBJECT_NAME (GST_OBJECT_PARENT(pad))) : \
-  "''", GST_OBJECT_NAME (pad)
+  "''" ) : "''", \
+  (pad==NULL) ? GST_OBJECT_NAME (pad) : "''"
 
 /**
  * GST_FUNCTION: