More exception tracking and removing double-exception wrapping