diff --git a/src/chat/NetworkClient.java b/src/chat/NetworkClient.java
index edc7a8c..7cdda4d 100644
--- a/src/chat/NetworkClient.java
+++ b/src/chat/NetworkClient.java
@@ -72,9 +72,9 @@ class ReceiveThread extends Thread {
 		boolean exit = false;
 		try
     	{
+			ObjectInputStream in = new ObjectInputStream(socket.getInputStream());
 			while(!exit)
-	        {
-			        ObjectInputStream in = new ObjectInputStream(socket.getInputStream());
+			{
 			        Message message = (Message) in.readObject();
 		        	if(message.getText() != null)
 		        	{
@@ -111,6 +111,7 @@ class ReceiveThread extends Thread {
 		
 			
     	}
+		catch(EOFException e) {}
 		catch(Exception e)
     	{
     		e.printStackTrace();
@@ -373,6 +374,7 @@ public class NetworkClient {
           
           user.setName(username);
           known_users.add(new User(username));
+          Collections.sort(known_users);
           
           chatText.append(username + " has joined the chat.\n");
           chatText.setCaretPosition(chatText.getDocument().getLength());