diff --git a/src/nm-manager.c b/src/nm-manager.c
index 925525663a..8d37f4b68c 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -4100,9 +4100,11 @@ impl_manager_set_logging (NMManager *manager,
 	}
 
 done:
-	if (error)
+	if (error) {
 		dbus_g_method_return_error (context, error);
-	g_clear_error (&error);
+		g_error_free (error);
+	} else
+		dbus_g_method_return (context);
 }
 
 static void