Domain exception cleanup

Previous commit broke...