diff --git a/build.gradle.kts b/build.gradle.kts
index 39fabb6..0d8408c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "us.ajg0702"
-version = "1.9.5"
+version = "1.9.6"
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java
index 98c815b..efe701a 100644
--- a/src/main/java/us/ajg0702/queue/Main.java
+++ b/src/main/java/us/ajg0702/queue/Main.java
@@ -243,6 +243,7 @@ public class Main extends Plugin implements Listener {
 					p.sendMessage(msgs.getBC("auto-queued", "SERVER:"+toName));
 					man.addToQueue(p, toName);
 				}, (long) (config.getDouble("auto-add-to-queue-on-kick-delay")*1000), TimeUnit.MILLISECONDS);
+				return;
 			}
 
 		}
diff --git a/src/main/java/us/ajg0702/queue/Manager.java b/src/main/java/us/ajg0702/queue/Manager.java
index ee80971..f1a544c 100644
--- a/src/main/java/us/ajg0702/queue/Manager.java
+++ b/src/main/java/us/ajg0702/queue/Manager.java
@@ -614,7 +614,7 @@ public class Manager {
 	 * @param p The player
 	 * @param s The name of the server
 	 */
-	public void addToQueue(ProxiedPlayer p, String s) {
+	public synchronized void addToQueue(ProxiedPlayer p, String s) {
 		if(p == null || s == null) return;
 		QueueServer server = findServer(s);
 		if(server == null) {
diff --git a/src/main/java/us/ajg0702/queue/spigot/Main.java b/src/main/java/us/ajg0702/queue/spigot/Main.java
index 5fafcc5..cc2cb14 100644
--- a/src/main/java/us/ajg0702/queue/spigot/Main.java
+++ b/src/main/java/us/ajg0702/queue/spigot/Main.java
@@ -45,6 +45,7 @@ public class Main extends JavaPlugin implements PluginMessageListener,Listener {
 				if(Bukkit.getOnlinePlayers().size() <= 0 || queuebatch.size() <= 0) return;
 				String msg = "";
 				for(Player p : queuebatch.keySet()) {
+					if(p == null || !p.isOnline()) continue;
 					msg += p.getName()+":"+queuebatch.get(p)+",";
 				}
 				if(msg.length() > 1) {