1 files changed, 13 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/events/PrintingEventHandler.java b/src/main/java/com/google/devtools/build/lib/events/PrintingEventHandler.java
index fc16475694..fc57456d9c 100644
--- a/src/main/java/com/google/devtools/build/lib/events/PrintingEventHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/events/PrintingEventHandler.java
@@ -81,7 +81,8 @@ public class PrintingEventHandler extends AbstractEventHandler
    */
   @Override
   public void handle(Event event) {
-    if (!getEventMask().contains(event.getKind())) {   
+    if (!getEventMask().contains(event.getKind())) {
+      handleFollowUpEvents(event);
       return;
     }
     try {
@@ -113,5 +114,16 @@ public class PrintingEventHandler extends AbstractEventHandler
        */
       outErr.printErrLn(e.getMessage());
     }
+    handleFollowUpEvents(event);
   }
+
+  private void handleFollowUpEvents(Event event) {
+    if (event.getStdErr() != null) {
+      handle(Event.of(EventKind.STDERR, null, event.getStdErr()));
+    }
+    if (event.getStdOut() != null) {
+      handle(Event.of(EventKind.STDOUT, null, event.getStdOut()));
+    }
+  }
+
 }