Bug fixes to Exception BREAK logic