diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/events/SuspendContextCommandImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/events/SuspendContextCommandImpl.java
index d891383b473f..f3ad39594d3a 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/events/SuspendContextCommandImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/events/SuspendContextCommandImpl.java
@@ -44,7 +44,6 @@ public abstract class SuspendContextCommandImpl extends DebuggerCommandImpl {
 
     final SuspendContextImpl suspendContext = getSuspendContext();
 
-    final int prio = getPriority().ordinal();
     if (suspendContext == null) {
       if (LOG.isDebugEnabled()) {
         LOG.debug("skip processing - context is null " + this);
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java
index 78214573ff23..8d8ddbb4b584 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java
@@ -520,6 +520,11 @@ public abstract class DebuggerTree extends DebuggerTreeBase implements DataProvi
         myChildren.clear();
         myChildren.add(myNodeManager.createMessageNode(new MessageDescriptor(e.getMessage())));
       }
+      catch (InvalidStackFrameException e) {
+        LOG.info(e);
+        myChildren.clear();
+        notifyCancelled();
+      }
       catch (InternalException e) {
         if (e.errorCode() == 35) {
           myChildren.add(