1 files changed, 7 insertions, 1 deletions
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ValueDescriptorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ValueDescriptorImpl.java
index abda6968def4..f4da39f318a7 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ValueDescriptorImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ValueDescriptorImpl.java
@@ -484,7 +484,7 @@ public abstract class ValueDescriptorImpl extends NodeDescriptorImpl implements
   }
 
   public boolean canSetValue() {
-    return !myIsSynthetic && isLvalue();
+    return myValueReady && !myIsSynthetic && isLvalue();
   }
 
   public String getValueLabel() {
@@ -534,4 +534,10 @@ public abstract class ValueDescriptorImpl extends NodeDescriptorImpl implements
     }
   }
 
+  public boolean canMark() {
+    if (!myValueReady) {
+      return false;
+    }
+    return getValue() instanceof ObjectReference;
+  }
 }