Small exception cleanup.