fixed null check bug #3
Merge pull request #44 from making/issues/3

fixed null check bug #3