Check for null property objects.

In certain cases these values come back as null. Added checks to account for them. This should fix Issue #67.