Fix another crash due to NPE
Merge pull request #19 from abiligiri/master

Fix another crash due to NPE