diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleServer.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleServer.java
index f03a5c3361c..7a257de89ab 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleServer.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleServer.java
@@ -127,13 +127,13 @@ public class SimpleServer extends LuceneTestCase {
 
         success = true;
       } catch (Throwable t) {
-        if (t instanceof SocketException == false) {
+        if (t instanceof SocketException == false && t instanceof NodeCommunicationException == false) {
           node.message("unexpected exception handling client connection:");
           t.printStackTrace(System.out);
           // Test should fail with this:
           throw new RuntimeException(t);
         } else {
-          node.message("SocketException " + t + " handling client connection; ignoring");
+          node.message("exception " + t + " handling client connection; ignoring");
         }
       } finally {
         if (success) {