diff --git a/lib/Backend/GroupBackend.php b/lib/Backend/GroupBackend.php
index 6174b26..0f1ef05 100644
--- a/lib/Backend/GroupBackend.php
+++ b/lib/Backend/GroupBackend.php
@@ -403,10 +403,6 @@ final class GroupBackend extends ABackend implements
             "Entering getGroupDetails($gid)", ["app" => $this->appName]
         );
 
-        if (empty($this->properties[DB::GROUP_NAME_COLUMN])) {
-            return [];
-        }
-
         $group = $this->getGroup($gid);
 
         if (!($group instanceof Group)) {
diff --git a/lib/Query/QueryProvider.php b/lib/Query/QueryProvider.php
index f13a18d..06cd02b 100644
--- a/lib/Query/QueryProvider.php
+++ b/lib/Query/QueryProvider.php
@@ -88,7 +88,7 @@ class QueryProvider implements \ArrayAccess
 
         $groupColumns
             = "$gGID AS gid, " .
-            (empty($gName) ? "null" : $gName) . " AS name, " .
+            (empty($gName) ? $gGID : $gName) . " AS name, " .
             (empty($gAdmin) ? "false" : $gAdmin) . " AS admin";
         $userColumns
             = "$uUID AS uid, " .