Refactor of error messages 1/2