diff --git a/akka-remote/src/main/scala/akka/remote/artery/Association.scala b/akka-remote/src/main/scala/akka/remote/artery/Association.scala index 08978b2af0..b9b446b4ac 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/Association.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/Association.scala @@ -232,8 +232,8 @@ private[remote] class Association( _outboundControlIngress match { case OptionVal.Some(o) => o case OptionVal.None => - if (transport.isShutdown) throw ShuttingDown - else throw new IllegalStateException("outboundControlIngress not initialized yet") + if (transport.isShutdown || isRemovedAfterQuarantined()) throw ShuttingDown + else throw new IllegalStateException(s"outboundControlIngress for [$remoteAddress] not initialized yet") } } }