diff --git a/runtime-rpc/src/test/java/org/capnproto/RpcTest.java b/runtime-rpc/src/test/java/org/capnproto/RpcTest.java
index 7eb64db..c7f2718 100644
--- a/runtime-rpc/src/test/java/org/capnproto/RpcTest.java
+++ b/runtime-rpc/src/test/java/org/capnproto/RpcTest.java
@@ -578,7 +578,9 @@ public class RpcTest {
 
         var unwrap = capSet.getLocalServer(pipeline).thenApply(unwrapped -> {
             Assert.assertNotNull(unwrapped);
-            return ((RpcTestUtil.TestCallOrderImpl)unwrapped).getCount();
+            return unwrapped != null
+                    ? ((RpcTestUtil.TestCallOrderImpl)unwrapped).getCount()
+                    : -1;
         });
 
         var call0 = getCallSequence(pipeline, 0);
@@ -602,7 +604,7 @@ public class RpcTest {
         Assert.assertEquals(5, call5.join().getN());
 
         int unwrappedAt = unwrap.join();
-        //Assert.assertTrue(unwrappedAt >= 3);
+        Assert.assertTrue(unwrappedAt >= 0);
     }
 }