Check for null property objects.
Merge pull request #68 from acastr7/develop

Check for null property objects.