diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index 4c6f7eaf75..55fca5ae27 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -4516,6 +4516,14 @@ find_master(NMManager             *self,
               nm_device_get_iface(master_device));
     }
 
+    if (!master_device && !master_connection) {
+        g_set_error_literal(error,
+                            NM_MANAGER_ERROR,
+                            NM_MANAGER_ERROR_UNKNOWN_DEVICE,
+                            "Master connection not found or invalid");
+        return FALSE;
+    }
+
     NM_SET_OUT(out_master_connection, master_connection);
     NM_SET_OUT(out_master_device, master_device);
     if (out_master_ac && master_connection) {
@@ -4527,14 +4535,6 @@ find_master(NMManager             *self,
                                                 NULL);
     }
 
-    if (!master_device && !master_connection) {
-        g_set_error_literal(error,
-                            NM_MANAGER_ERROR,
-                            NM_MANAGER_ERROR_UNKNOWN_DEVICE,
-                            "Master connection not found or invalid");
-        return FALSE;
-    }
-
     return TRUE;
 }