diff --git a/gst/gstbus.c b/gst/gstbus.c
index 7385725600..ee97b6a88e 100644
--- a/gst/gstbus.c
+++ b/gst/gstbus.c
@@ -484,9 +484,7 @@ gst_bus_timed_pop_filtered (GstBus * bus, GstClockTime timeout,
 
       GST_DEBUG_OBJECT (bus, "got message %p, %s from %s, type mask is %u",
           message, GST_MESSAGE_TYPE_NAME (message),
-          GST_MESSAGE_SRC (message) ?
-          GST_OBJECT_NAME (GST_MESSAGE_SRC (message)) : "NULL", (guint) types);
-
+          GST_MESSAGE_SRC_NAME (message), (guint) types);
       if ((GST_MESSAGE_TYPE (message) & types) != 0) {
         /* exit the loop, we have a message */
         goto beach;
diff --git a/gst/gstevent.c b/gst/gstevent.c
index 00c79ba022..4ee64fcbb8 100644
--- a/gst/gstevent.c
+++ b/gst/gstevent.c
@@ -654,6 +654,9 @@ gst_event_new_segment (const GstSegment * segment)
   GstEvent *event;
 
   g_return_val_if_fail (segment != NULL, NULL);
+  g_return_val_if_fail (segment->rate != 0.0, NULL);
+  g_return_val_if_fail (segment->applied_rate != 0.0, NULL);
+  g_return_val_if_fail (segment->format != GST_FORMAT_UNDEFINED, NULL);
 
   GST_CAT_INFO (GST_CAT_EVENT, "creating segment event %" GST_SEGMENT_FORMAT,
       segment);