avoid NPE
Revert "avoid NPE"

This reverts commit 2a86063e4036eb644150c5bd88e266123ce349a1.
Merge remote-tracking branch 'eXist/develop' into develop
avoid NPE
Merge pull request #156 from shabanovd/develop

avoid NPE