diff --git a/eaglercraftbungee/src/main/java/net/md_5/bungee/ServerConnector.java b/eaglercraftbungee/src/main/java/net/md_5/bungee/ServerConnector.java
index 98b91e0..043769b 100644
--- a/eaglercraftbungee/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/eaglercraftbungee/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -119,7 +119,7 @@ public class ServerConnector extends PacketHandler
             this.ch.write(this.user.getSettings());
         }
         synchronized (this.user.getSwitchMutex()) {
-            if (this.user.getServer() == null || this.user.getServer().getInfo() == null) {
+            if (this.user.getServer() == null) {
                 this.user.setClientEntityId(login.getEntityId());
                 this.user.setServerEntityId(login.getEntityId());
                 Packet1Login modLogin;
diff --git a/eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandEnd.java b/eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandEnd.java
index 503e3de..0fa652a 100644
--- a/eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandEnd.java
+++ b/eaglercraftbungee/src/main/java/net/md_5/bungee/command/CommandEnd.java
@@ -10,7 +10,7 @@ import net.md_5.bungee.api.plugin.Command;
 
 public class CommandEnd extends Command {
 	public CommandEnd() {
-		super("end", "bungeecord.command.end", new String[] { "stop", "exit", "quit" });
+		super("end", "bungeecord.command.end", new String[] { "exit", "quit" });
 	}
 
 	@Override
diff --git a/stable-download/java/bungee_command/bungee-dist.jar b/stable-download/java/bungee_command/bungee-dist.jar
index 3275e91..6c8a628 100644
Binary files a/stable-download/java/bungee_command/bungee-dist.jar and b/stable-download/java/bungee_command/bungee-dist.jar differ
diff --git a/stable-download/stable-download.zip b/stable-download/stable-download.zip
index dad3a64..40cfce6 100644
Binary files a/stable-download/stable-download.zip and b/stable-download/stable-download.zip differ
diff --git a/stable-download/stable-download_livestream.zip b/stable-download/stable-download_livestream.zip
index 1800443..d941f3f 100644
Binary files a/stable-download/stable-download_livestream.zip and b/stable-download/stable-download_livestream.zip differ
diff --git a/stable-download/stable-download_repl.zip b/stable-download/stable-download_repl.zip
index f8da9fc..48bb013 100644
Binary files a/stable-download/stable-download_repl.zip and b/stable-download/stable-download_repl.zip differ