more exception cleanup [ci skip]