Fixed crash
Merge pull request #2 from lclc98/master

Fixed npe