Minor exception cleanup.