diff --git a/src/main/java/lab12/ServerApp.java b/src/main/java/lab12/ServerApp.java
index f051ab926afb4deef9579cd9e5c288561810062c..71acf9468c7e167310ac54cbed4d6245bdb41026 100644
--- a/src/main/java/lab12/ServerApp.java
+++ b/src/main/java/lab12/ServerApp.java
@@ -1,5 +1,6 @@
 package lab12;
 
+import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 
@@ -22,14 +23,13 @@ public class ServerApp {
 
 	protected void listen() {
 		System.out.println("Server started and ready to connection");
-		try {
-			while (true) {
-				Socket socketFromClient = server.accept();
+		while (true) {
+			try(Socket socketFromClient = server.accept()) {
 				System.out.println("Client connected: " + socketFromClient.getInetAddress());
 				new ServerComunicator(socketFromClient).handle();
+			} catch (IOException e) {
+				e.printStackTrace();
 			}
-		} catch (Exception e) {
-			e.printStackTrace();
 		}
 	}
 	
diff --git a/src/main/java/lab12/ServerComunicator.java b/src/main/java/lab12/ServerComunicator.java
index 4eccc0462379bcd49a6b82be338eb85a112a3ac3..bb9d7155e2296f82b6db3b972b0c01ac8ef32b42 100644
--- a/src/main/java/lab12/ServerComunicator.java
+++ b/src/main/java/lab12/ServerComunicator.java
@@ -22,7 +22,7 @@ public class ServerComunicator {
 			System.out.println("New thread starteds. Thred ID = " + Thread.currentThread().getId());
 			do {
 				lineRededClient = readerFromClentSocket.readLine();
-				System.out.println("Thred ID = " + Thread.currentThread().getId() + " readed from client: " + lineRededClient);
+				System.out.println("Thread ID = " + Thread.currentThread().getId() + " readed from client: " + lineRededClient);
 				writerToClentSocket.write("Your text is interesting! Do you like this one? ");
 				writerToClentSocket.write(lineRededClient.toUpperCase());
 				writerToClentSocket.newLine();