Merge pull request #147 from copolii/master

fixed an NPE crash