diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index d620fbf5..3ac6396f 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -217,7 +217,7 @@ public final class UserConnection implements ProxiedPlayer
     public void connectNow(ServerInfo target)
     {
         dimensionChange = true;
-        connect(target);
+        connect( target );
     }
 
     public ServerInfo updateAndGetNextServer(ServerInfo currentTarget)
@@ -252,6 +252,11 @@ public final class UserConnection implements ProxiedPlayer
             {
                 callback.done( false, null );
             }
+
+            if ( getServer() == null && !ch.isClosing() )
+            {
+                throw new IllegalStateException("Cancelled ServerConnectEvent with no server or disconnect.");
+            }
             return;
         }