diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java
index 8ace70d..3eaab6a 100644
--- a/src/main/java/us/ajg0702/queue/Main.java
+++ b/src/main/java/us/ajg0702/queue/Main.java
@@ -280,7 +280,12 @@ public class Main extends Plugin implements Listener {
 	@EventHandler
 	public void onMessage(PluginMessageEvent e) {
 		//getLogger().info("Recieved message of "+e.getTag());
+		if(e.getTag().equals("ajqueue:tospigot")) {
+			e.setCancelled(true);
+			return;
+		}
 		if(!e.getTag().equals("ajqueue:tobungee")) return;
+		if(!(e.getReceiver() instanceof ProxiedPlayer)) return;
 		e.setCancelled(true);
 		DataInputStream in = new DataInputStream(new ByteArrayInputStream(e.getData()));
 		try {
diff --git a/src/main/java/us/ajg0702/queue/spigot/Commands.java b/src/main/java/us/ajg0702/queue/spigot/Commands.java
index fbb60ba..356fd41 100644
--- a/src/main/java/us/ajg0702/queue/spigot/Commands.java
+++ b/src/main/java/us/ajg0702/queue/spigot/Commands.java
@@ -16,9 +16,12 @@ public class Commands implements CommandExecutor {
 
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if(!(sender instanceof Player)) return true;
-		Player player = (Player) sender;
+		Player player = null;
+		if(sender instanceof Player) {
+			player = (Player) sender;
+		}
 		if(command.getName().equals("leavequeue")) {
+			if(player == null) return true;
 			StringBuilder arg = new StringBuilder();
 			for(String a : args) {
 				arg.append(" ");