Null checks
Merge pull request #24 from wikiLingo/1.x

Null checks