diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
index 5588ce0fd1a..1314bd9ce04 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
@@ -102,7 +102,7 @@ void NodeInstanceClientProxy::initializeCapturedStream(const QString &fileName)
     bool inputStreamCanBeOpened = m_inputIoDevice->open(QIODevice::ReadOnly);
     if (!inputStreamCanBeOpened) {
         qDebug() << "Input stream file cannot be opened: " << fileName;
-        QCoreApplication::exit(-1);
+        exit(-1);
     }
 
     if (QCoreApplication::arguments().count() == 3) {
@@ -111,14 +111,14 @@ void NodeInstanceClientProxy::initializeCapturedStream(const QString &fileName)
         bool outputStreamCanBeOpened = m_outputIoDevice->open(QIODevice::WriteOnly);
         if (!outputStreamCanBeOpened) {
             qDebug() << "Output stream file cannot be opened";
-            QCoreApplication::exit(-1);
+            exit(-1);
         }
     } else if (QCoreApplication::arguments().count() == 4) {
         m_controlStream.setFileName(QCoreApplication::arguments().at(3));
         bool controlStreamCanBeOpened = m_controlStream.open(QIODevice::ReadOnly);
         if (!controlStreamCanBeOpened) {
             qDebug() << "Control stream file cannot be opened";
-            QCoreApplication::exit(-1);
+            exit(-1);
         }
     }
 
@@ -170,7 +170,7 @@ void NodeInstanceClientProxy::writeCommand(const QVariant &command)
 
         if (!compareCommands(command, controlCommand)) {
             qDebug() << "Commands differ!";
-            QCoreApplication::exit(-1);
+            exit(-1);
         }
     } else if (m_outputIoDevice) {
         QByteArray block;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
index d16c9415b00..04e1fa8dd40 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
@@ -109,5 +109,8 @@ int main(int argc, char *argv[])
     SetErrorMode(SEM_NOGPFAULTERRORBOX); //We do not want to see any message boxes
 #endif
 
-    return application.exec();
+    if (application.arguments().at(1) == "--readcapturedstream")
+        return 0;
+
+    return application.exec();;
 }