fixed nullpointer exception
Merge pull request #174 from glee23/master

Fixed NullPointerException