diff --git a/Essentials/src/main/java/com/earth2me/essentials/perm/PermissionsHandler.java b/Essentials/src/main/java/com/earth2me/essentials/perm/PermissionsHandler.java
index 974e761f5a7..0cbad14775b 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/perm/PermissionsHandler.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/perm/PermissionsHandler.java
@@ -52,7 +52,10 @@ public List<String> getGroups(final OfflinePlayer base) {
         final long start = System.nanoTime();
         final List<String> groups = new ArrayList<>();
         groups.add(defaultGroup);
-        groups.addAll(handler.getGroups(base));
+        final List<String> handlerGroups = handler.getGroups(base);
+        if (handlerGroups != null && !handlerGroups.isEmpty()) {
+            groups.addAll(handlerGroups);
+        }
         checkPermLag(start, String.format("Getting groups for %s", base.getName()));
         return Collections.unmodifiableList(groups);
     }