Fix inconsistent use of property_exists
Fix whitespace
Merge pull request #366 from colemanw/property

Fix inconsistent use of property_exists