Change a couple more cases to DomainErrors.