diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java
index 96e4b64aecf6..e24067f711d3 100644
--- a/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java
@@ -237,6 +237,7 @@ public class StackFrameProxyImpl extends JdiProxy implements StackFrameProxy {
     return myThisReference;
   }
 
+  @NotNull
   public List<LocalVariableProxyImpl> visibleVariables() throws EvaluateException {
     DebuggerManagerThreadImpl.assertIsManagerThread();
     InvalidStackFrameException error = null;
@@ -312,6 +313,7 @@ public class StackFrameProxyImpl extends JdiProxy implements StackFrameProxy {
     throw new EvaluateException(error.getMessage(), error);
   }
 
+  @NotNull
   public List<Value> getArgumentValues() throws EvaluateException {
     DebuggerManagerThreadImpl.assertIsManagerThread();
     InvalidStackFrameException error = null;
diff --git a/java/jdkAnnotations/com/sun/jdi/annotations.xml b/java/jdkAnnotations/com/sun/jdi/annotations.xml
index 8d2899ad4598..1f5ce668732d 100644
--- a/java/jdkAnnotations/com/sun/jdi/annotations.xml
+++ b/java/jdkAnnotations/com/sun/jdi/annotations.xml
@@ -2,4 +2,20 @@
   <item name='com.sun.jdi.ClassType com.sun.jdi.ClassType superclass()'>
     <annotation name='org.jetbrains.annotations.Nullable'/>
   </item>
+  <item name='com.sun.jdi.StackFrame com.sun.jdi.LocalVariable visibleVariableByName(java.lang.String)'>
+    <annotation name='org.jetbrains.annotations.Nullable'/>
+  </item>
+  <item name='com.sun.jdi.StackFrame com.sun.jdi.ObjectReference thisObject()'>
+    <annotation name='org.jetbrains.annotations.Nullable'/>
+  </item>
+  <item name='com.sun.jdi.StackFrame java.util.List&lt;com.sun.jdi.LocalVariable&gt; visibleVariables()'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+  <item name='com.sun.jdi.StackFrame java.util.List&lt;com.sun.jdi.Value&gt; getArgumentValues()'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+  <item
+      name='com.sun.jdi.StackFrame java.util.Map&lt;com.sun.jdi.LocalVariable,com.sun.jdi.Value&gt; getValues(java.util.List&lt;? extends com.sun.jdi.LocalVariable&gt;)'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
 </root>
\ No newline at end of file