improve case where service.switch exists but is missing a service