Update exception catching at end of loop