Fixes problem with potential null values coming from nested properties.

Fixes #213