diff --git a/jeepyb/cmd/manage_projects.py b/jeepyb/cmd/manage_projects.py
index 194c627..3fe95a2 100644
--- a/jeepyb/cmd/manage_projects.py
+++ b/jeepyb/cmd/manage_projects.py
@@ -247,11 +247,11 @@
     if _gerrit_version is None:
         _gerrit_version = ''.join(gerrit.getVersion().split('.')[:2])
 
+    if group in GERRIT_SYSTEM_GROUPS:
+        return GERRIT_SYSTEM_GROUPS[group]
     uuid = _get_group_uuid(group, gerrit, _gerrit_version, run_local, retries=1)
     if uuid:
         return uuid
-    if group in GERRIT_SYSTEM_GROUPS:
-        return GERRIT_SYSTEM_GROUPS[group]
     gerrit.createGroup(group)
     for user in gerrit.listMembers(group):
         if gerrit.username == user['username']: