Adding a null check
Merge pull request #5 from bholmes/dev-master

Adding a null check