diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts
index 2e4f85da3..bfd37abcc 100644
--- a/src/Netscript/NetscriptHelpers.ts
+++ b/src/Netscript/NetscriptHelpers.ts
@@ -493,15 +493,10 @@ function getValidPort(ctx: NetscriptContext, port: number): IPort {
     );
   }
   let iport = NetscriptPorts.get(port);
-  if (iport == null || !(iport instanceof Object)) {
-    NetscriptPorts.set(port, NetscriptPort());
+  if (!iport) {
+    iport = NetscriptPort();
+    NetscriptPorts.set(port, iport);
   }
-  // Try again.
-  iport = NetscriptPorts.get(port);
-  if (iport == null || !(iport instanceof Object)) {
-    throw helpers.makeRuntimeErrorMsg(ctx, `Could not find port: ${port}. This is a bug. Report to dev.`);
-  }
-
   return iport;
 }
 
diff --git a/src/NetscriptWorker.ts b/src/NetscriptWorker.ts
index 22f96230f..b73fc2551 100644
--- a/src/NetscriptWorker.ts
+++ b/src/NetscriptWorker.ts
@@ -45,9 +45,7 @@ export function prestigeWorkerScripts(): void {
     killWorkerScript(ws);
   }
 
-  for (const [__, port] of NetscriptPorts.entries()) {
-    port.clear();
-  }
+  NetscriptPorts.clear();
 
   WorkerScriptStartStopEventEmitter.emit();
   workerScripts.clear();