diff --git a/src/main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java b/src/main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java
index 555fda1b2e513d2e809b6899bd99cac92fe44d0d..6e0999a7a9075488503b36d20ba9ef4c3805c29f 100644
--- a/src/main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java
+++ b/src/main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java
@@ -1228,7 +1228,7 @@ public class LDAPLoginManagerImpl implements LDAPLoginManager, GenericEventListe
 				try {
 					newCount++;
 					Identity identity = createAndPersistUser(userAttrs);
-					if(StringHelper.containsNonWhitespace(ldapUser.getDn())) {
+					if(identity != null && StringHelper.containsNonWhitespace(ldapUser.getDn())) {
 						dnToIdentityKeyMap.put(ldapUser.getDn(), ldapUser);
 						ldapUser.setCachedIdentity(new IdentityRefImpl(identity.getKey()));
 					}