Some exception cleanup