Exception map fixes