fixes to StopOnExternalDomain