Another improvement to the error message handling.