Merge pull request #18 from etugarev/issues/SLING-8858

SLING-8858 - Added NPE check