Error messages, create and update method improved