Null check
Merge pull request #30 from boneill42/master

Null check