diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketD1Team.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketD1Team.java
index 9ffc3fee..69bf3771 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketD1Team.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketD1Team.java
@@ -36,7 +36,8 @@ public class PacketD1Team extends DefinedPacket
     public PacketD1Team(String name)
     {
         this();
-        mode = 1;
+        this.name = name;
+        this.mode = 1;
     }
 
     @Override
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 8439ceb4..0983d67e 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -266,7 +266,7 @@ public class ServerConnector extends PacketHandler
     @Override
     public void handle(PacketFAPluginMessage pluginMessage) throws Exception
     {
-        if ( pluginMessage.getData().length == 0 && pluginMessage.getTag().equals( "BungeeCord" ) )
+        if ( pluginMessage.equals( PacketConstants.I_AM_BUNGEE) )
         {
             throw new IllegalStateException( "May not connect to another BungeCord!" );
         }