diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketJoinGame.java b/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketJoinGame.java
index 12885b5..a51f527 100644
--- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketJoinGame.java
+++ b/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketJoinGame.java
@@ -178,8 +178,7 @@ public class PacketJoinGame implements PacketOut {
             if (version.moreOrEqual(Version.V1_18_2)) {
                 msg.writeCompoundTag(dimensionRegistry.getCodec_1_18_2());
                 msg.writeCompoundTag(dimensionRegistry.getDefaultDimension_1_18_2().getData());
-            }
-            else {
+            } else {
                 msg.writeCompoundTag(dimensionRegistry.getCodec_1_16());
                 msg.writeCompoundTag(dimensionRegistry.getDefaultDimension_1_16().getData());
             }
diff --git a/src/main/java/ru/nanit/limbo/server/CommandManager.java b/src/main/java/ru/nanit/limbo/server/CommandManager.java
index 21d9d66..fbb9192 100644
--- a/src/main/java/ru/nanit/limbo/server/CommandManager.java
+++ b/src/main/java/ru/nanit/limbo/server/CommandManager.java
@@ -1,5 +1,6 @@
 package ru.nanit.limbo.server;
 
+import java.util.NoSuchElementException;
 import java.util.Scanner;
 
 public final class CommandManager extends Thread {
@@ -7,9 +8,14 @@ public final class CommandManager extends Thread {
     @Override
     public void run() {
         Scanner scanner = new Scanner(System.in);
+        String line;
 
         while (true) {
-            String line = scanner.nextLine();
+            try {
+                line = scanner.nextLine();
+            } catch (NoSuchElementException e) {
+                break;
+            }
 
             if (line.equalsIgnoreCase("stop")) {
                 System.exit(0);
@@ -19,4 +25,5 @@ public final class CommandManager extends Thread {
             Logger.info("Unknown command");
         }
     }
+
 }