diff --git a/src/main/scala/li/cil/oc/common/component/TerminalServer.scala b/src/main/scala/li/cil/oc/common/component/TerminalServer.scala
index 6cecfbd0e..a2909b982 100644
--- a/src/main/scala/li/cil/oc/common/component/TerminalServer.scala
+++ b/src/main/scala/li/cil/oc/common/component/TerminalServer.scala
@@ -293,7 +293,7 @@ object TerminalServer {
 
     def find(address: String): Option[TerminalServer] = {
       completePending()
-      Some(ready.getOrDefault(address, null))
+      ready.get(address)
     }
   }
 }