diff --git a/source/externalui.py b/source/externalui.py
index 8d065d123..dd0775500 100755
--- a/source/externalui.py
+++ b/source/externalui.py
@@ -219,16 +219,16 @@ class ExternalUI(object):
                 line2 = "(null)"
             elif isinstance(line, str):
                 line2 = line.replace("\n", "\r")
+            elif isinstance(line, bool):
+                line2 = "true" if line else "false"
+            elif isinstance(line, int):
+                line2 = "%i" % line
+            elif isinstance(line, float):
+                line2 = "%.10f" % line
             else:
-                if isinstance(line, bool):
-                    line2 = "true" if line else "false"
-                elif isinstance(line, int):
-                    line2 = "%i" % line
-                elif isinstance(line, float):
-                    line2 = "%.10f" % line
-                else:
-                    print("unknown data type to send:", type(line))
-                    return
+                print("unknown data type to send:", type(line))
+                return
 
             self.fPipeSend.write(line2 + "\n")
-            self.fPipeSend.flush()
+
+        self.fPipeSend.flush()
diff --git a/source/utils/CarlaPipeUtils.cpp b/source/utils/CarlaPipeUtils.cpp
index add45b8e7..8dcac6c52 100644
--- a/source/utils/CarlaPipeUtils.cpp
+++ b/source/utils/CarlaPipeUtils.cpp
@@ -748,7 +748,7 @@ const char* CarlaPipeCommon::readline() noexcept
             continue;
         }
 
-        if (pData->tmpStr.isNotEmpty() || ptr != pData->tmpBuf)
+        if (pData->tmpStr.isNotEmpty() || ptr != pData->tmpBuf || ret == 1)
         {
             if (ptr != pData->tmpBuf)
             {