Domain exception cleanup

Previous commit broke...
Merge remote-tracking branch 'origin/dev'