diff --git a/pom.xml b/pom.xml
index 6d73a8e..04f65f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.finn.unlegitlibrary</groupId>
     <artifactId>unlegitlibrary</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
diff --git a/src/main/java/me/finn/unlegitlibrary/event/EventManager.java b/src/main/java/me/finn/unlegitlibrary/event/EventManager.java
index 53ca7af..3f7381f 100644
--- a/src/main/java/me/finn/unlegitlibrary/event/EventManager.java
+++ b/src/main/java/me/finn/unlegitlibrary/event/EventManager.java
@@ -54,15 +54,17 @@ public class EventManager extends DefaultMethodsOverrider {
             HashMap<EventPriority, HashMap<Object, Method>> priorityMap = registeredListener.get(eventClass);
 
             if (priorityMap != null) {
-                for (EventPriority priority : priorityMap.keySet()) {
-                    HashMap<Object, Method> listeners = priorityMap.get(priority);
-                    if (listeners != null) {
-                        listeners.remove(clazz);
-                        if (listeners.isEmpty()) priorityMap.remove(priority);
+                synchronized (priorityMap) {
+                    for (EventPriority priority : priorityMap.keySet()) {
+                        HashMap<Object, Method> listeners = priorityMap.get(priority);
+                        if (listeners != null) {
+                            listeners.remove(clazz);
+                            if (listeners.isEmpty()) priorityMap.remove(priority);
+                        }
                     }
-                }
 
-                if (priorityMap.isEmpty()) registeredListener.remove(eventClass);
+                    if (priorityMap.isEmpty()) registeredListener.remove(eventClass);
+                }
             }
         }
 
diff --git a/src/main/java/me/finn/unlegitlibrary/network/system/server/ClientHandler.java b/src/main/java/me/finn/unlegitlibrary/network/system/server/ClientHandler.java
index 1d5010e..eaf55a4 100644
--- a/src/main/java/me/finn/unlegitlibrary/network/system/server/ClientHandler.java
+++ b/src/main/java/me/finn/unlegitlibrary/network/system/server/ClientHandler.java
@@ -97,7 +97,7 @@ public class ClientHandler {
         clientID = -1;
         receiveThread.interrupt();
 
-        networkServer.getClientHandlers().remove(this);
+        synchronized (networkServer.getClientHandlers()) { networkServer.getClientHandlers().remove(this); }
         networkServer.getEventManager().executeEvent(new S_ClientStoppedEvent(this));
     }