Refactor of domain part exceptions