Update error codes on properties

Related to #346
Merge remote-tracking branch 'refs/remotes/origin/master'