diff --git a/JChatServer/bin/pad/prac2/Connection.class b/JChatServer/bin/pad/prac2/Connection.class
index 91aeb10..891b892 100644
--- a/JChatServer/bin/pad/prac2/Connection.class
+++ b/JChatServer/bin/pad/prac2/Connection.class
diff --git a/JChatServer/bin/pad/prac2/JChat.class b/JChatServer/bin/pad/prac2/JChat.class
index 4eb79da..0906afc 100644
--- a/JChatServer/bin/pad/prac2/JChat.class
+++ b/JChatServer/bin/pad/prac2/JChat.class
diff --git a/JChatServer/bin/pad/prac2/MySocket.class b/JChatServer/bin/pad/prac2/MySocket.class
index d646e02..ea93697 100644
--- a/JChatServer/bin/pad/prac2/MySocket.class
+++ b/JChatServer/bin/pad/prac2/MySocket.class
diff --git a/JChatServer/src/pad/prac2/Connection.java b/JChatServer/src/pad/prac2/Connection.java
index 757e66a..5002a5d 100644
--- a/JChatServer/src/pad/prac2/Connection.java
+++ b/JChatServer/src/pad/prac2/Connection.java
@@ -134,6 +134,7 @@ public class Connection extends Thread
 						}
 						else if(str.equals(""))
 						{
+							System.out.println(serv.getNickname(this) + " disconnected");
 							break;
 						}
 						else
@@ -145,6 +146,7 @@ public class Connection extends Thread
 					catch(IOException ioExc)
 					{
 						System.out.println("TCP: Error writing to socket");
+						System.out.println(serv.getNickname(this) + " disconnected");
 						break;
 					}
 				}
diff --git a/JChatServer/src/pad/prac2/JChat.java b/JChatServer/src/pad/prac2/JChat.java
index 1e794d2..cb9311a 100644
--- a/JChatServer/src/pad/prac2/JChat.java
+++ b/JChatServer/src/pad/prac2/JChat.java
@@ -9,14 +9,14 @@ public class JChat
 		
 		String ip;
 		int port, roomSize;
-		/*Scanner in = new Scanner(System.in);
+		Scanner in = new Scanner(System.in);
 		System.out.print("IP: ");
 		ip = in.nextLine();
 		System.out.print("Port: ");
 		port = in.nextInt();
 		System.out.print("Size of chatroom: ");
 		roomSize = in.nextInt();
-		in.close();*/
+		in.close();
 		ip = "localhost";
 		port = 3001;
 		roomSize = 2;
diff --git a/JChatServer/src/pad/prac2/MySocket.java b/JChatServer/src/pad/prac2/MySocket.java
index a41eb88..26d367b 100644
--- a/JChatServer/src/pad/prac2/MySocket.java
+++ b/JChatServer/src/pad/prac2/MySocket.java
@@ -56,7 +56,7 @@ public class MySocket extends Socket
 		String len,str;
 		int length;
 		len = this.readLine();
-		if(len == null)
+		if(len == "")
 		{
 			return len;
 		}