diff --git a/src/main/java/net/minecraft/server/RemoteControlSession.java b/src/main/java/net/minecraft/server/RemoteControlSession.java
index b56a8db8f6..9d4c234a77 100644
--- a/src/main/java/net/minecraft/server/RemoteControlSession.java
+++ b/src/main/java/net/minecraft/server/RemoteControlSession.java
@@ -84,12 +84,12 @@ public class RemoteControlSession extends RemoteConnectionThread {
                         }
                     }
                 } catch (SocketTimeoutException sockettimeoutexception) {
-                    continue;
+                    return; // CraftBukkit - shut down the thread after hitting an exception.
                 } catch (IOException ioexception) {
                     if (this.running) {
                         this.info("IO: " + ioexception.getMessage());
                     }
-                    continue;
+                    return; // CraftBukkit - shut down the thread after hitting an exception.
                 }
                 } // CraftBukkit - Loop shift
             } catch (Exception exception1) {