diff --git a/Tests/ExperimentalTests/Helpers/PeerConnectionTestHelpers.cs b/Tests/ExperimentalTests/Helpers/PeerConnectionTestHelpers.cs
index 86cdb4ff..406422da 100644
--- a/Tests/ExperimentalTests/Helpers/PeerConnectionTestHelpers.cs
+++ b/Tests/ExperimentalTests/Helpers/PeerConnectionTestHelpers.cs
@@ -28,10 +28,7 @@ namespace LogosStorageTests.Helpers
             var result = string.Empty;
             foreach (var peer in entry.Response.Table.Nodes)
             {
-                var known = allEntries.SingleOrDefault(e => e.Response.Table.LocalNode.PeerId == peer.PeerId);
-                if (known == null) continue;
-
-                var expected = known.Node.GetDiscoveryEndpoint().ToString();
+                var expected = GetExpectedDiscoveryEndpoint(allEntries, peer);
                 if (expected != peer.Address)
                 {
                     result += $"Node:{entry.Node.GetName()} has incorrect peer table entry. Was: '{peer.Address}', expected: '{expected}'. ";
@@ -55,5 +52,12 @@ namespace LogosStorageTests.Helpers
             }
             return PeerConnectionState.Unknown;
         }
+
+        private static string GetExpectedDiscoveryEndpoint(Entry[] allEntries, DebugInfoTableNode node)
+        {
+            var peer = allEntries.SingleOrDefault(e => e.Response.Table.LocalNode.PeerId == node.PeerId);
+            if (peer == null) return $"peerId: {node.PeerId} is not known.";
+            return peer.Node.GetDiscoveryEndpoint().ToString();
+        }
     }
 }