Null check on indexed properties
Merge pull request #29 from sanjaymandadi/Dev

Null check on indexed properties