From 261c06f1d6f445f101027c2f4a26aaefb756e350 Mon Sep 17 00:00:00 2001
From: adelphes <adelphes@gmail.com>
Date: Sat, 24 Jun 2017 12:20:21 +0100
Subject: [PATCH] Ensure the cached fields are populated before showing the
 Exception UI

---
 src/debugMain.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/debugMain.js b/src/debugMain.js
index 4b48ce6..f7a0b8e 100644
--- a/src/debugMain.js
+++ b/src/debugMain.js
@@ -1124,7 +1124,7 @@ class AndroidDebugSession extends DebugSession {
         if (!thread.paused) return this.cancelRequestThreadNotSuspended('Exception info', args.threadId, response);
         if (!thread.paused.last_exception) return this.failRequest('No exception available', response);
 
-        if (!thread.paused.last_exception.objvar) {
+        if (!thread.paused.last_exception.objvar || !thread.paused.last_exception.cached) {
             // we must wait for the exception object to be retreived as a local (along with the message field)
             if (!thread.paused.last_exception.waitForExObject) {
                 thread.paused.last_exception.waitForExObject = $.Deferred().then(() => {