diff --git a/src/main/java/org/ovirt/engine/extension/aaa/misc/QueryExecutor.java b/src/main/java/org/ovirt/engine/extension/aaa/misc/QueryExecutor.java
index 8e71455..b94a791 100644
--- a/src/main/java/org/ovirt/engine/extension/aaa/misc/QueryExecutor.java
+++ b/src/main/java/org/ovirt/engine/extension/aaa/misc/QueryExecutor.java
@@ -93,8 +93,14 @@ public ExtMap buildPrincipalRecord(Map<String, String> headers, String nameArg,
     }
 
     public Collection<ExtMap> buildPrincipalRecordGroups(Map<String, String> headers, String groupsArg) {
+        List<String> groupNames;
+        if (headers.containsKey(groupsArg)) {
+            groupNames = Arrays.asList(headers.get(groupsArg).split(","));
+        } else {
+            return Collections.emptyList();
+        }
+
         LinkedList<ExtMap> groups = new LinkedList<>();
-        List<String> groupNames = Arrays.asList(headers.get(groupsArg).split(","));
         for (String groupName : groupNames) {
             groupName = groupName.replaceFirst("^/", "");
             ExtMap group = new ExtMap();