Updated the domain validation exception and handling