diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index 3bd339a9d79704d41e0f426daec55ff459e998b7..a7cbdc7cd38d8a9de057fa263a7eecbdabdf961a 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -206,15 +206,15 @@ static dbus_bool_t virDBusAddWatch(DBusWatch *watch,
 # else
     fd = dbus_watch_get_fd(watch);
 # endif
+    dbus_watch_set_data(watch, info, virDBusWatchFree);
     info->bus = (DBusConnection *)data;
     info->watch = virEventAddHandle(fd, flags,
                                     virDBusWatchCallback,
                                     watch, NULL);
     if (info->watch < 0) {
-        VIR_FREE(info);
+        dbus_watch_set_data(watch, NULL, NULL);
         return 0;
     }
-    dbus_watch_set_data(watch, info, virDBusWatchFree);
 
     return 1;
 }