REL-1811: Bug fix NPE.
Merge pull request #21 from fnussber/feature/REL-1811-B

REL-1811: Bug fix NPE.