Null pointer Error fix
Merge pull request #7 from daanvc/master

Null pointer Error fix