diff --git a/src/main/java/net/md_5/bungee/BungeeCord.java b/src/main/java/net/md_5/bungee/BungeeCord.java
index 5e4d8251..bf801b48 100644
--- a/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -200,6 +200,7 @@ public class BungeeCord
         }
 
         $().info("Thank you and goodbye");
+        System.exit(0);
     }
 
     /**
diff --git a/src/main/java/net/md_5/bungee/InitialHandler.java b/src/main/java/net/md_5/bungee/InitialHandler.java
index b4c67776..59772679 100644
--- a/src/main/java/net/md_5/bungee/InitialHandler.java
+++ b/src/main/java/net/md_5/bungee/InitialHandler.java
@@ -78,11 +78,11 @@ public class InitialHandler implements Runnable
                     break;
                 case 0xFE:
                     socket.setSoTimeout(100);
-                    boolean newPing = true;
+                    boolean newPing = false;
                     try
                     {
                         socket.getInputStream().read();
-                        newPing = false;
+                        newPing = true;
                     } catch (IOException ex)
                     {
                     }