diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/EventBus.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/EventBus.java
index a77da29..ba8d9cd 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/EventBus.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/EventBus.java
@@ -2,6 +2,7 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Consumer;
@@ -16,6 +17,7 @@ public class EventBus {
     }
 
     public <T extends Event> void publish(T event) {
+        Objects.requireNonNull(event, "event must not be null");
         List<Consumer<Object>> subscribers = handlers.get(event.getClass());
         if (subscribers != null) {
             subscribers.forEach(h -> h.accept(event));