Better handling of properties and errors