diff --git a/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java b/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
index d2cb271..f405d95 100644
--- a/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
+++ b/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
@@ -169,7 +169,7 @@ public class EventHandlerImpl implements EventHandler {
         }
 
         ImmutableList<QueueServer> queuedServers = main.getQueueManager().getPlayerQueues(player);
-        if(!queuedServers.contains(main.getQueueManager().findServer(from.getName())) && main.getConfig().getBoolean("auto-add-to-queue-on-kick")) {
+        if(from != null && !queuedServers.contains(main.getQueueManager().findServer(from.getName())) && main.getConfig().getBoolean("auto-add-to-queue-on-kick")) {
 
             List<String> reasons = main.getConfig().getStringList("auto-add-kick-reasons");
             boolean shouldqueue = false;
@@ -193,7 +193,7 @@ public class EventHandlerImpl implements EventHandler {
 
         }
 
-
+        assert from != null;
         for(QueueServer server : queuedServers) {
             if(!(server.getServerNames().contains(from.getName()))) continue;
             QueuePlayer queuePlayer = server.findPlayer(player);
diff --git a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java
index a55b795..7675a92 100644
--- a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java
+++ b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java
@@ -124,7 +124,7 @@ public class BungeeQueue extends Plugin implements Listener {
         Component reason = BungeeComponentSerializer.get().deserialize(e.getKickReasonComponent());
         main.getEventHandler().onServerKick(
                 new BungeePlayer(e.getPlayer()),
-                new BungeeServer(e.getCancelServer()),
+                new BungeeServer(e.getKickedFrom()),
                 reason,
                 false
         );