diff --git a/src/gui/mcqr_run_view/mcqrqprocess.cpp b/src/gui/mcqr_run_view/mcqrqprocess.cpp
index d436c198cb7658f35a14560ccc565824b109b6e1..cd69a0c164aa6c195995ba9ec53d4af833250108 100644
--- a/src/gui/mcqr_run_view/mcqrqprocess.cpp
+++ b/src/gui/mcqr_run_view/mcqrqprocess.cpp
@@ -67,17 +67,18 @@ McqrQProcess::executeMcqrStep(const QString &mcqr_step_name,
 {
 
   write(QString("message(\"MCQRBegin: %1\")\n").arg(mcqr_step_name).toUtf8());
-  
+
   executeOffTheRecord("vl <- tryCatch({\n");
   write(mcqr_step.toUtf8());
+
+  write(QString("message(\"MCQREnd: %1\")\n").arg(mcqr_step_name).toUtf8());
   // write(mcqr_step.toUtf8());
   executeOffTheRecord(
-    "\n},warning = function(warn) {\n print(paste(\"MY "
-    "WARNING: "
-    "\", warn))\n},error "
-    "= function(err) {\n print(paste(\"MY ERROR: \",err))\n},finally = "
-    "function(f) "
-    "{\n print(paste(\"e: \", e))\n})\n print(paste(\"Output: \", vl))\n");
-  
-  write(QString("message(\"MCQREnd: %1\")\n").arg(mcqr_step_name).toUtf8());
+    QString(
+      "\n},warning = function(warn) {\n print(paste(\"WARNING: "
+      "\", warn))\n},error "
+      "= function(err) {\n print(paste(\"Error in %1 : \",err))\n},finally = "
+      "function(f) "
+      "{\n print(paste(\"e: \", e))\n})\n print(paste(\"Output: \", vl))\n")
+      .arg(mcqr_step_name));
 }