diff --git a/cs654/proj1/KaZaClient.java b/cs654/proj1/KaZaClient.java
index 1004896..4c0da04 100644
--- a/cs654/proj1/KaZaClient.java
+++ b/cs654/proj1/KaZaClient.java
@@ -19,6 +19,8 @@ public class KaZaClient
                       String sharedFolder, String server)
     {
         m_sharedFolder = sharedFolder;
+        if (userName == null || userName.trim().equals(""))
+            userName = "Anonymous";
 
         try {
             m_socket = new Socket(server, KaZaServer.LISTEN_PORT);
@@ -209,7 +211,6 @@ public class KaZaClient
                 for (;;)
                 {
                     int bytesRead = is.read(buff, 0, buff.length);
-                    System.out.println("bytesRead: " + bytesRead);
                     if (bytesRead < 0)
                         break;
                     fos.write(buff, 0, bytesRead);
diff --git a/cs654/proj1/KaZaServer.java b/cs654/proj1/KaZaServer.java
index 34933e0..4bf1e9f 100644
--- a/cs654/proj1/KaZaServer.java
+++ b/cs654/proj1/KaZaServer.java
@@ -199,11 +199,19 @@ public class KaZaServer implements Runnable
         {
             synchronized (m_peerGroupLeaders)
             {
-                for (Socket s : m_peerGroupLeaders)
+                for (int i = 0; i < m_peerGroupLeaders.size(); i++)
                 {
-                    String peerResults =
-                        getSearchResultsFromPeerGroupLeader(s, depth-1, query);
-                    results += peerResults;
+                    if (m_peerGroupLeaders.elementAt(i).isClosed())
+                    {
+                        m_peerGroupLeaders.removeElementAt(i);
+                        i--;
+                    }
+                    else
+                    {
+                        String peerResults =
+                            getSearchResultsFromPeerGroupLeader(s, depth-1, query);
+                        results += peerResults;
+                    }
                 }
             }
         }