diff --git a/cs656/lab2/src/ChatClient.java b/cs656/lab2/src/ChatClient.java
index 41b11a6..0f8e181 100644
--- a/cs656/lab2/src/ChatClient.java
+++ b/cs656/lab2/src/ChatClient.java
@@ -77,6 +77,8 @@ public class ChatClient
                     {
                         /* read and print a message from a peer */
                         String in = br.readLine();
+                        if (in == null)
+                            break;
                         System.out.println(in);
                     }
                 }