Use UnexpectedTypeException and fix typos
Merge pull request #1373 from winzou/fix/shipping

Use UnexpectedTypeException and fix typos