Add error code to message, adjust classification logic