Continues work on exception handling

Exception mappers will be in the future!