SLING-3387 Fix potential NPE

Applying patch by Michael Dürig (thanks alot)

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