Merge "Update an error message."