Fixed mapping of errors