Merge pull request #38 from ronaldoeyeem/master

masks (not real fix) NullPointerException
Fix NPE