diff --git a/src/MsBuildPipeLogger.Server/PipeLoggerServer.cs b/src/MsBuildPipeLogger.Server/PipeLoggerServer.cs
index 4b312fd..4f7286e 100644
--- a/src/MsBuildPipeLogger.Server/PipeLoggerServer.cs
+++ b/src/MsBuildPipeLogger.Server/PipeLoggerServer.cs
@@ -69,12 +69,20 @@ public bool Read()
                 return false;
             }
 
-            BuildEventArgs args = _buildEventArgsReader.Read();
-            if (args != null)
+            try
             {
-                Dispatch(args);
-                return true;
+                BuildEventArgs args = _buildEventArgsReader.Read();
+                if (args != null)
+                {
+                    Dispatch(args);
+                    return true;
+                }
             }
+            catch (EndOfStreamException)
+            {
+                // Nothing else to read
+            }
+
             return false;
         }