diff --git a/fluent/StorageRune.ts b/fluent/StorageRune.ts
index 843c0d280..43b780f79 100644
--- a/fluent/StorageRune.ts
+++ b/fluent/StorageRune.ts
@@ -113,7 +113,7 @@ export class StorageRune<
       blockHash?: string,
     ]>
   ) {
-    const storageKey = this.$key.encoded(partialKey).map(hex.encode)
+    const storageKey = this.$partialKey.encoded(partialKey).map(hex.encode)
     const startKey = Rune.captureUnhandled(
       [this.$key, start],
       (codec, start) =>
diff --git a/rpc/ws.ts b/rpc/ws.ts
index 79ebaf1b6..9a94ac792 100644
--- a/rpc/ws.ts
+++ b/rpc/ws.ts
@@ -8,9 +8,9 @@ export class WsConnection extends Connection {
     super()
     this.ws = new WebSocket(url)
     this.ws.addEventListener("message", (e) => this.handle(JSON.parse(e.data)))
-    this.ws.addEventListener("error", (e) => { // TODO: recovery
+    this.ws.addEventListener("error", (e) => {
       console.log(e)
-      Deno.exit(1)
+      throw new Error("TODO: more graceful error messaging / recovery")
     })
   }