fix NullPointerException
Merge pull request #23 from twonky4/master

fix NullPointerException