More improvements for abnormal exits.