fixing NPE, see https://community.jboss.org/message/654260
Merge pull request #75 from inxmailgmbh/develop

fixing NPE, see https://community.jboss.org/message/654260