Fixes problem with potential null values coming from nested properties.
Merge pull request #216 from daFish/fix/issue-213

Fixes problem with potential null values coming from nested properties.