diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 8e0e4d71..15430dde 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -170,14 +170,17 @@ public class DownstreamBridge extends PacketHandler
                 t.setSuffix( team.suffix );
                 t.setFriendlyMode( team.friendlyFire );
             }
-            for ( String s : team.players )
+            if ( team.players != null )
             {
-                if ( team.mode == 0 || team.mode == 3 )
+                for ( String s : team.players )
                 {
-                    t.addPlayer( s );
-                } else
-                {
-                    t.removePlayer( s );
+                    if ( team.mode == 0 || team.mode == 3 )
+                    {
+                        t.addPlayer( s );
+                    } else
+                    {
+                        t.removePlayer( s );
+                    }
                 }
             }
         }