Domain exceptions improvements