diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java
index 33912fb27958..82ec640f9665 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java
@@ -58,7 +58,7 @@ public class JavaExecutionStack extends XExecutionStack {
     if (current) {
       return AllIcons.Debugger.ThreadCurrent;
     }
-    else if (threadProxy.getThreadReference().isAtBreakpoint()) {
+    else if (threadProxy.isAtBreakpoint()) {
       return AllIcons.Debugger.ThreadAtBreakpoint;
     }
     else if (threadProxy.isSuspended()) {
diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java
index c2ad3ddebb75..b14175cf7acc 100644
--- a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -303,4 +303,13 @@ public final class ThreadReferenceProxyImpl extends ObjectReferenceProxyImpl imp
       return false;
     }
   }
+
+  public boolean isAtBreakpoint() {
+    try {
+      return getThreadReference().isAtBreakpoint();
+    } catch (InternalException e) {
+      LOG.info(e);
+    }
+    return false;
+  }
 }
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ThreadDescriptorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ThreadDescriptorImpl.java
index dd505620ea56..7f5d5762afb4 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ThreadDescriptorImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ThreadDescriptorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,7 +100,7 @@ public class ThreadDescriptorImpl extends NodeDescriptorImpl implements ThreadDe
     }
     myIsExpandable   = calcExpandable(myIsSuspended);
     mySuspendContext = SuspendManagerUtil.getSuspendContextForThread(suspendContext, thread);
-    myIsAtBreakpoint = suspendManager != null? SuspendManagerUtil.findContextByThread(suspendManager, thread) != null : thread.getThreadReference().isAtBreakpoint();
+    myIsAtBreakpoint = suspendManager != null? SuspendManagerUtil.findContextByThread(suspendManager, thread) != null : thread.isAtBreakpoint();
     myIsCurrent      = suspendContext != null? suspendContext.getThread() == thread : false;
     myIsFrozen       = suspendManager != null? suspendManager.isFrozen(thread) : myIsSuspended;
   }