Improved exception mappers.
Improved exception mappers.