diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java
index 63f04eafbaf..7ed6c21e54a 100755
--- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java
@@ -58,10 +58,8 @@ public DirContext getContext(String principal, String credentials) throws Passwo
 
             LdapUtils.closeContext(ctx);
 
-            if (ctrl != null) {
-                if (ctrl.isLocked()) {
+            if (ctrl != null && ctrl.getErrorStatus()!=null) {
                     throw new PasswordPolicyException(ctrl.getErrorStatus());
-                }
             }
 
             throw LdapUtils.convertLdapException(ne);