NullPointerException fix
Merge pull request #25 from skynet67/master

NullPointerException fix