Use UnexpectedTypeException and fix typos