1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
index a44acdd370..01d2a98a74 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
@@ -317,9 +317,16 @@ ExpressionEvalJob::ExpressionEvalJob(QV4::ExecutionEngine *engine, int frameNr,
 
 void ExpressionEvalJob::handleResult(QV4::ScopedValue &result)
 {
+    if (hasExeption())
+        exception = result->toQStringNoThrow();
     collector->collect(result);
 }
 
+const QString &ExpressionEvalJob::exceptionMessage() const
+{
+    return exception;
+}
+
 GatherSourcesJob::GatherSourcesJob(QV4::ExecutionEngine *engine, int seq)
     : engine(engine)
     , seq(seq)