Modifications for the new error message format.