Check for null property objects.

Found a couple more places where the property value might come back null. Added checks to account for them. This is related to Issue #67.