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 11c6a186..283be459 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -142,7 +142,9 @@ public class ServerConnector extends PacketHandler
             if ( !user.ch.isActive() )
             {
                 server.disconnect( "Quitting" );
-                throw new IllegalStateException( "No client connected for pending server!" );
+                // Silly server admins see stack trace and die
+                bungee.getLogger().warning( "No client connected for pending server!" );
+                return;
             }
 
             // Add to new server