diff --git a/src/tl/tl/tlStream.cc b/src/tl/tl/tlStream.cc
index e6d8d2b6f..193b0fabe 100644
--- a/src/tl/tl/tlStream.cc
+++ b/src/tl/tl/tlStream.cc
@@ -1106,10 +1106,22 @@ size_t
 InputPipe::read (char *b, size_t n)
 {
   tl_assert (m_file != NULL);
-  size_t ret = fread (b, 1, n, m_file);
-  if (ret < n) {
-    if (ferror (m_file)) {
-      throw FilePReadErrorException (m_source, ferror (m_file));
+
+  bool retry = true;
+  size_t ret = 0;
+
+  while (retry) {
+    retry = false;
+    ret = fread (b, 1, n, m_file);
+    if (ret < n) {
+      if (ferror (m_file)) {
+        if (errno != EINTR) {
+          throw FilePReadErrorException (m_source, errno);
+        } else if (ret == 0) {
+          retry = true;
+          clearerr (m_file);
+        }
+      }
     }
   }
 
@@ -1138,7 +1150,7 @@ OutputPipe::OutputPipe (const std::string &path)
 OutputPipe::~OutputPipe ()
 {
   if (m_file != NULL) {
-    fclose (m_file);
+    pclose (m_file);
     m_file = NULL;
   }  
 }
@@ -1147,10 +1159,11 @@ void
 OutputPipe::write (const char *b, size_t n)
 {
   tl_assert (m_file != NULL);
+
   size_t ret = fwrite (b, 1, n, m_file);
   if (ret < n) {
-    if (ferror (m_file)) {
-      throw FilePWriteErrorException (m_source, ferror (m_file));
+    if (ferror (m_file) && errno != EINTR) {
+      throw FilePReadErrorException (m_source, errno);
     }
   }
 }
diff --git a/src/tl/unit_tests/tlStreamTests.cc b/src/tl/unit_tests/tlStreamTests.cc
index 733db501d..f2fb84218 100644
--- a/src/tl/unit_tests/tlStreamTests.cc
+++ b/src/tl/unit_tests/tlStreamTests.cc
@@ -52,6 +52,23 @@ TEST(InputPipe2)
   EXPECT_NE (ret, 0);
 }
 
+TEST(OutputPipe1)
+{
+  std::string tf = tmp_file ("pipe_out");
+
+  {
+    tl::OutputPipe pipe ("cat >" + tf);
+    tl::OutputStream str (pipe);
+    str << "Hello, world!";
+  }
+
+  {
+    tl::InputStream is (tf);
+    std::string s = is.read_all ();
+    EXPECT_EQ (s, "Hello, world!");
+  }
+}
+
 TEST(TextOutputStream)
 {
   std::string fn = tmp_file ("test.txt");
diff --git a/testdata/net_tracer/t6_all_nets.oas.gz.4 b/testdata/net_tracer/t6_all_nets.oas.gz.4
new file mode 100644
index 000000000..e94e268a5
Binary files /dev/null and b/testdata/net_tracer/t6_all_nets.oas.gz.4 differ