diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
index ddfd34ec81b3a3a666a21fdd923a0297617c794c..ab001db8cae6dd2a18aac6993ddc82133554086c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
@@ -323,6 +323,7 @@ final public class AuthorizationDataProvider implements IAuthorizationDataProvid
                 public void execute(List<V> entities)
                 {
                     List<?> mappedValues = valuesMapperOrNull != null ? valuesMapperOrNull.map(entities) : entities;
+                    assertNoNullElements(mappedValues);
                     query.setParameterList(parameterName, mappedValues);
 
                     List<R> singleResults = cast(query.list());
@@ -356,6 +357,17 @@ final public class AuthorizationDataProvider implements IAuthorizationDataProvid
 
         return fullResults;
     }
+    
+    private void assertNoNullElements(List<?> list)
+    {
+        for (Object object : list)
+        {
+            if (object == null)
+            {
+                throw new NullPointerException();
+            }
+        }
+    }
 
     @Override
     public SpacePE tryGetSpace(SpaceOwnerKind kind, TechId techId)