diff --git a/foo.raw b/foo.raw
new file mode 100644
index 0000000..fe79320
Binary files /dev/null and b/foo.raw differ
diff --git a/runtime-rpc/src/main/java/org/capnproto/RpcState.java b/runtime-rpc/src/main/java/org/capnproto/RpcState.java
index 3582b70..ea8f930 100644
--- a/runtime-rpc/src/main/java/org/capnproto/RpcState.java
+++ b/runtime-rpc/src/main/java/org/capnproto/RpcState.java
@@ -301,6 +301,11 @@ final class RpcState<VatId> {
                 answer.redirectedResults = null;
             }
 
+            if (answer.pipeline != null) {
+                pipelinesToRelease.add(answer.pipeline);
+                answer.pipeline = null;
+            }
+
             if (answer.callContext != null) {
                 answer.callContext.requestCancel();
             }
diff --git a/runtime-rpc/src/test/java/org/capnproto/RpcTest.java b/runtime-rpc/src/test/java/org/capnproto/RpcTest.java
index c054119..18c794a 100644
--- a/runtime-rpc/src/test/java/org/capnproto/RpcTest.java
+++ b/runtime-rpc/src/test/java/org/capnproto/RpcTest.java
@@ -567,17 +567,16 @@ public class RpcTest {
             response.thenRun(() -> Assert.fail("Never completing call returned?"));
         }
         catch (CompletionException exc) {
-            Assert.assertTrue(exc instanceof CompletionException);
             Assert.assertNotNull(exc.getCause());
             Assert.assertTrue(exc.getCause() instanceof RpcException);
-            Assert.assertTrue(((RpcException)exc.getCause()).getType() == RpcException.Type.FAILED);
+            Assert.assertSame(((RpcException) exc.getCause()).getType(), RpcException.Type.FAILED);
         }
         catch (Exception exc) {
             Assert.fail(exc.toString());
         }
 
         // check that the connection is still open
-        getCallSequence(client, 1);
+        this.context.runUntil(getCallSequence(client, 1)).join();
     }
 
     @org.junit.Test
@@ -625,5 +624,21 @@ public class RpcTest {
         int unwrappedAt = this.context.runUntil(unwrap).join();
         Assert.assertTrue(unwrappedAt >= 0);
     }
+
+    @org.junit.Test
+    public void testEmbargoNull() {
+        var client = new Test.TestMoreStuff.Client(context.connect(Test.TestSturdyRefObjectId.Tag.TEST_MORE_STUFF));
+        var promise = client.getNullRequest().send();
+        var cap = promise.getNullCap();
+        var call0 = cap.getCallSequenceRequest().send();
+        this.context.runUntil(promise);
+        var call1 = cap.getCallSequenceRequest().send();
+
+        Assert.assertThrows(CompletionException.class, () -> this.context.runUntil(call0).join());
+        Assert.assertThrows(CompletionException.class, () -> this.context.runUntil(call1).join());
+
+        // check that the connection is still open
+        this.context.runUntil(getCallSequence(client, 0)).join();
+    }
 }
 
diff --git a/runtime-rpc/src/test/java/org/capnproto/RpcTestUtil.java b/runtime-rpc/src/test/java/org/capnproto/RpcTestUtil.java
index 1de666f..370940b 100644
--- a/runtime-rpc/src/test/java/org/capnproto/RpcTestUtil.java
+++ b/runtime-rpc/src/test/java/org/capnproto/RpcTestUtil.java
@@ -220,6 +220,11 @@ class RpcTestUtil {
                 System.out.println(cap);
             });
         }
+
+        @Override
+        protected CompletableFuture<java.lang.Void> getNull(CallContext<Test.TestMoreStuff.GetNullParams.Reader, Test.TestMoreStuff.GetNullResults.Builder> context) {
+            return READY_NOW;
+        }
     }
 
     static class TestTailCalleeImpl extends Test.TestTailCallee.Server {
diff --git a/runtime-rpc/src/test/java/org/capnproto/TwoPartyTest.java b/runtime-rpc/src/test/java/org/capnproto/TwoPartyTest.java
index 2586e22..39cb109 100644
--- a/runtime-rpc/src/test/java/org/capnproto/TwoPartyTest.java
+++ b/runtime-rpc/src/test/java/org/capnproto/TwoPartyTest.java
@@ -111,7 +111,7 @@ public class TwoPartyTest {
     }
 
     @org.junit.Test
-    public void testDisconnect() throws IOException {
+    public void testDisconnect() {
         //this.serverSocket.shutdownOutput();
         //this.serverNetwork.close();
         //this.serverNetwork.onDisconnect().join();
diff --git a/runtime/src/main/java/org/capnproto/Capability.java b/runtime/src/main/java/org/capnproto/Capability.java
index 71bcbd1..14e00fa 100644
--- a/runtime/src/main/java/org/capnproto/Capability.java
+++ b/runtime/src/main/java/org/capnproto/Capability.java
@@ -562,11 +562,11 @@ public final class Capability {
     }
 
     public static ClientHook newNullCap() {
-        return newBrokenClient(new RuntimeException("Called null capability"), true, ClientHook.NULL_CAPABILITY_BRAND);
+        return newBrokenClient(RpcException.failed("Called null capability"), true, ClientHook.NULL_CAPABILITY_BRAND);
     }
 
     static private ClientHook newBrokenClient(String reason, boolean resolved, Object brand) {
-        return newBrokenClient(new RuntimeException(reason), resolved, brand);
+        return newBrokenClient(RpcException.failed(reason), resolved, brand);
     }
 
     static private ClientHook newBrokenClient(Throwable exc, boolean resolved, Object brand) {