Remove error_code and modify error description