Null pointer fix
Merge pull request #32 from icompuiz/master

Null pointer fix