Further exception cleanup