Changed domain controller to not throw exception