Merge "Fix typo in exception message"