Add error codes to the corresponding messages, and a default error option