diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java
index b56be2b4..5e7dab18 100644
--- a/src/main/java/carpet/script/CarpetEventServer.java
+++ b/src/main/java/carpet/script/CarpetEventServer.java
@@ -176,7 +176,7 @@ public class CarpetEventServer
 
         public void removeAllCalls(String hostName)
         {
-            callList.removeIf((c)-> c.host.equals(hostName));
+            callList.removeIf((c)-> c.host != null && c.host.equals(hostName));
         }
     }