diff --git a/src/de/steamwar/bungeecore/listeners/BrandListener.java b/src/de/steamwar/bungeecore/listeners/BrandListener.java
index cbc16a41..4c810de6 100644
--- a/src/de/steamwar/bungeecore/listeners/BrandListener.java
+++ b/src/de/steamwar/bungeecore/listeners/BrandListener.java
@@ -35,13 +35,18 @@ public class BrandListener extends BasicListener {
 
     @EventHandler
     public void onServerSwitch(PluginMessageEvent event) {
-        if(!event.getTag().equals("minecraft:brand") || !event.getTag().equals("MC|Brand")) {
+        if(!event.getTag().equals("minecraft:brand") && !event.getTag().equals("MC|Brand")) {
             return;
         }
 
         if(event.getReceiver().getAddress().getHostName().contains("localhost")) {
             return;
         }
+        event.setCancelled(true);
+
+        if (!(event.getReceiver() instanceof ProxiedPlayer)) {
+            return;
+        }
 
         BungeeCore.get().getProxy().getScheduler().schedule(BungeeCore.get(), () -> {
             ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();