SLING-3568 related: paranoid NPE check

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1600069 13f79535-47bb-0310-9956-ffa450edef68