diff --git a/emul.c b/emul.c
index 63d1060..cb90430 100644
--- a/emul.c
+++ b/emul.c
@@ -8,10 +8,10 @@
     emul_inst_exec_init();
     emul_inst_exec_load(arg);
     code = emul_inst_exec_run();
-    emul_inst_exec_end();
     if (code == Failed) {
         printf("Abend exit\n");
     }
+    emul_inst_exec_end();
 }
 
 int main(int argc, char *argv[]) {
diff --git a/emul_repl.c b/emul_repl.c
index 017b6a2..f5df076 100644
--- a/emul_repl.c
+++ b/emul_repl.c
@@ -34,9 +34,9 @@
         emul_inst_exec_loadline(input);
         state = emul_inst_exec_run();
         if (state == Failed) {
-            printw("Abend exit\n");
+            emul_out_std_debug("Abend exit\n");
         } else if (state == Success) {
-            printw("Sucsess\n");
+            emul_out_std_debug("Sucsess\n");
             break;
         }
     }