improved format for property not found error
Merge remote-tracking branch 'upstream/master'