Fixed a few bugs with exception maps