Fixed some issues with the recent changes to the exception mappers.