diff --git a/admin/src/main/java/org/tidepool/keycloak/extensions/resource/TidepoolAdminResource.java b/admin/src/main/java/org/tidepool/keycloak/extensions/resource/TidepoolAdminResource.java
index 997645d..5f858b0 100644
--- a/admin/src/main/java/org/tidepool/keycloak/extensions/resource/TidepoolAdminResource.java
+++ b/admin/src/main/java/org/tidepool/keycloak/extensions/resource/TidepoolAdminResource.java
@@ -16,7 +16,7 @@
 
 public class TidepoolAdminResource extends AdminResource {
 
-    private final String ID_SEPARATOR = ",";
+    private static final String ID_SEPARATOR = ",";
 
     private final KeycloakSession session;
 
@@ -37,7 +37,9 @@ public Response getUsersById(@QueryParam("ids") String ids) {
 
             for (String id : ids.split(ID_SEPARATOR)) {
                 UserModel user = provider.getUserById(id, realm);
-                representations.add(toRepresentation(user, realm));
+                if (user != null) {
+                    representations.add(toRepresentation(user, realm));
+                }
             }
         }