diff --git a/test/dbus-daemon-eavesdrop.c b/test/dbus-daemon-eavesdrop.c
index 41985787..9dac06f2 100644
--- a/test/dbus-daemon-eavesdrop.c
+++ b/test/dbus-daemon-eavesdrop.c
@@ -88,11 +88,12 @@ sender_send_unicast_to_sender (Fixture *f)
 
   signal = dbus_message_new_signal (SENDER_PATH, SENDER_IFACE,
       SENDER_SIGNAL_NAME);
-  dbus_message_set_destination (signal, dbus_bus_get_unique_name (f->sender));
-
   if (signal == NULL)
     g_error ("OOM");
 
+  if (!dbus_message_set_destination (signal, dbus_bus_get_unique_name (f->sender)))
+    g_error ("OOM");
+
   if (!dbus_connection_send (f->sender, signal, NULL))
     g_error ("OOM");
 
@@ -109,11 +110,12 @@ sender_send_unicast_to_receiver (Fixture *f)
   DBusMessage *signal;
 
   signal = dbus_message_new_signal (SENDER_PATH, SENDER_IFACE, SENDER_SIGNAL_NAME);
-  dbus_message_set_destination (signal, dbus_bus_get_unique_name (f->receiver));
-
   if (signal == NULL)
     g_error ("OOM");
 
+  if (!dbus_message_set_destination (signal, dbus_bus_get_unique_name (f->receiver)))
+    g_error ("OOM");
+
   if (!dbus_connection_send (f->sender, signal, NULL))
     g_error ("OOM");
 
@@ -128,11 +130,12 @@ sender_send_broadcast (Fixture *f)
   DBusMessage *signal;
 
   signal = dbus_message_new_signal (SENDER_PATH, SENDER_IFACE, SENDER_SIGNAL_NAME);
-  dbus_message_set_destination (signal, NULL);
-
   if (signal == NULL)
     g_error ("OOM");
 
+  if (!dbus_message_set_destination (signal, NULL))
+    g_error ("OOM");
+
   if (!dbus_connection_send (f->sender, signal, NULL))
     g_error ("OOM");
 
@@ -152,11 +155,12 @@ sender_send_stopper (Fixture *f)
   DBusMessage *signal;
 
   signal = dbus_message_new_signal (SENDER_PATH, SENDER_IFACE, SENDER_STOPPER_NAME);
-  dbus_message_set_destination (signal, NULL);
-
   if (signal == NULL)
     g_error ("OOM");
 
+  if (!dbus_message_set_destination (signal, NULL))
+    g_error ("OOM");
+
   if (!dbus_connection_send (f->sender, signal, NULL))
     g_error ("OOM");