more work on add-to-exception-map
working on generating exceptions