Merge "fix typo for exception message"