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 17b0a84..9316cbd 100644
--- a/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
+++ b/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
@@ -138,18 +138,18 @@ public class EventHandlerImpl implements EventHandler {
         }
 
 
-
         String serverName = player.getServerName();
         List<String> svs = main.getConfig().getStringList("queue-servers");
         for(String s : svs) {
             if(!s.contains(":")) continue;
             String[] parts = s.split(":");
             String from = parts[0];
-            String to = parts[1];
-            if(from.equalsIgnoreCase(serverName)) {
+            QueueServer to = main.getQueueManager().findServer(parts[1]);
+            if(from.equalsIgnoreCase(serverName) && to != null) {
                 main.getQueueManager().addToQueue(player, to);
             }
         }
+
     }
 
     @Override