Bail out early when appropriate.
Merge pull request #1559 from braddunbar/property-guard

Bail out early when appropriate.