Merge branch 'dev' into wip-persistence

akkadotnet · Jun 22, 2018 · 334d899 · 334d899
2 parents 79484cd + 8463034
commit 334d899
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/core/Akka.Remote/RemoteWatcher.cs b/src/core/Akka.Remote/RemoteWatcher.cs
@@ -642,10 +642,13 @@ private void ProcessTerminated(IInternalActorRef watchee, bool existenceConfirme
 
             if (!addressTerminated)
             {
-                foreach (var watcher in Watching[watchee])
+                if (Watching.TryGetValue(watchee, out var watchers))
                 {
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    watcher.SendSystemMessage(new DeathWatchNotification(watchee, existenceConfirmed, addressTerminated));
+                    foreach (var watcher in watchers)
+                    {
+                        // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                        watcher.SendSystemMessage(new DeathWatchNotification(watchee, existenceConfirmed, addressTerminated));
+                    }
                 }
             }