1 files changed, 6 insertions, 3 deletions
diff --git a/main.cpp b/main.cpp
index f5f51c3016..bdd5b37dd9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -169,15 +169,18 @@ int evaluateCompiledCode(const QStringList &files)
         globalObject->setProperty(ctx, vm.identifier(QStringLiteral("print")),
                                   QQmlJS::VM::Value::fromObject(new builtins::Print(ctx)));
 
-        code(ctx);
-
-        if (ctx->hasUncaughtException) {
+        void * buf = __qmljs_create_exception_handler(ctx);
+        if (setjmp(*(jmp_buf *)buf)) {
             if (VM::ErrorObject *e = ctx->result.asErrorObject())
                 std::cerr << "Uncaught exception: " << qPrintable(e->value.toString(ctx)->toQString()) << std::endl;
             else
                 std::cerr << "Uncaught exception: " << qPrintable(ctx->result.toString(ctx)->toQString()) << std::endl;
+            return -2;
         }
+
+        code(ctx);
     }
+
     return 0;
 }