Merge "Fix the wrong error message"