More exception cleanup