diff --git a/cs656/lab2/src/ChatClient.java b/cs656/lab2/src/ChatClient.java
index 783be1c..41b11a6 100644
--- a/cs656/lab2/src/ChatClient.java
+++ b/cs656/lab2/src/ChatClient.java
@@ -247,7 +247,6 @@ public class ChatClient
                 }
                 else if (command.equals("exit"))
                 {
-                    unregister();
                     myListenThread.interrupt();
                     break;
                 }
@@ -261,6 +260,7 @@ public class ChatClient
         {
             e.printStackTrace();
         }
+        unregister();
 		System.exit(0);
 	}