Better handle not-alive remote endpoints