tweak: check variables before use
Merge branch 'develop' into ldap