replace propery with safe_property in some evaluate cases. fixes #249