diff --git a/Capnp.Net.Runtime.Tests/TcpRpcInterop.cs b/Capnp.Net.Runtime.Tests/TcpRpcInterop.cs
index 0d283f3..051da1f 100644
--- a/Capnp.Net.Runtime.Tests/TcpRpcInterop.cs
+++ b/Capnp.Net.Runtime.Tests/TcpRpcInterop.cs
@@ -345,7 +345,7 @@ namespace Capnp.Net.Runtime.Tests
                             }));
                         }
 
-                        // Ensure that all answers either return (probably in canceled state)
+                        // Ensure that all answers return (probably in canceled state)
                         Assert.IsTrue(Task.WhenAll(taskList).Wait(LargeNonDbgTimeout));
 
                         // Not part of original test. "Terminate" sequence with
diff --git a/Capnp.Net.Runtime/Rpc/RpcEngine.cs b/Capnp.Net.Runtime/Rpc/RpcEngine.cs
index be864fe..f114197 100644
--- a/Capnp.Net.Runtime/Rpc/RpcEngine.cs
+++ b/Capnp.Net.Runtime/Rpc/RpcEngine.cs
@@ -1453,16 +1453,12 @@ namespace Capnp.Rpc
 
             void IRpcEndpoint.RemoveImport(uint importId)
             {
-                bool exists;
-
                 lock (_reentrancyBlocker)
                 {
-                    exists = _importTable.Remove(importId);
-                }
-
-                if (!exists)
-                {
-                    Logger.LogError("Inconsistent import table detected");
+                    if (!_importTable.Remove(importId))
+                    {
+                        throw new ArgumentException("Given ID does not exist in import table");
+                    }
                 }
             }