Merge "Fix error message to match the code."