Merge pull request #1819 from jrouzierinverse/ldap-null-check