diff --git a/.gitmodules b/.gitmodules
index 083047ed..ffabdd8b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "CommonCore"]
 	path = CommonCore
-	url = gitea@steamwar.de:SteamWar/CommonCore.git
+	url = https://steamwar.de/devlabs/SteamWar/CommonCore.git
diff --git a/src/de/steamwar/bungeecore/listeners/BrandListener.java b/src/de/steamwar/bungeecore/listeners/BrandListener.java
index fae5fb39..db3bcf26 100644
--- a/src/de/steamwar/bungeecore/listeners/BrandListener.java
+++ b/src/de/steamwar/bungeecore/listeners/BrandListener.java
@@ -58,9 +58,9 @@ public class BrandListener extends BasicListener {
         if (!(event.getReceiver() instanceof ProxiedPlayer)) {
             return;
         }
-        ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
-
         event.setCancelled(true);
+
+        ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
         String brandString = ChatSender.of(player).parseToLegacy("STEAMWAR_BRAND", ProxyServer.getInstance().getName(), player.getServer().getInfo().getName(), new String(event.getData(), 1, event.getData().length - 1));
 
         ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();