Merge "Minor fix to wrong error message"