Remove exception catching

Also move exceptions to be a subclass of MappingException