diff --git a/lib/client_impl.c b/lib/client_impl.c
index fc36338c..8f167ac0 100644
--- a/lib/client_impl.c
+++ b/lib/client_impl.c
@@ -150,7 +150,7 @@ static int log_error(const char *fmt, ...)
 
 static void hop_off_the_bus(DBusConnection **bus)
 {
-	if (bus == NULL)
+	if (bus == NULL || *bus == NULL)
 		return;
 
 	dbus_connection_unref(*bus);