add: better catching
Merge branch 'develop' into ldap