Merge pull request #143 from kovacevicm/master

Avoid NPE during JNDI lookup