Add Null check
Merge pull request #20 from nataren/issue_19

Add Null check.