Improved error typing.