diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
index 74d3a2ffe953..eadf8c72aebb 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
@@ -1176,6 +1176,11 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
     requestManager.setThreadFilter(null);
   }
 
+  /**
+   * Prefer using {@link SuspendContextImpl#getManagerThread()},
+   * {@link EvaluationContextImpl#getManagerThread()},
+   * or {@link DebuggerContextImpl#getManagerThread()} instead.
+   */
   @ApiStatus.Obsolete
   @Override
   public final @NotNull DebuggerManagerThreadImpl getManagerThread() {
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationContextImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationContextImpl.java
index 3aaf6a5adbb5..6ad40c1a2c55 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationContextImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationContextImpl.java
@@ -78,7 +78,7 @@ public final class EvaluationContextImpl extends UserDataHolderBase implements E
     return getSuspendContext().getDebugProcess();
   }
 
-  public DebuggerManagerThreadImpl getManagerThread() {
+  public @NotNull DebuggerManagerThreadImpl getManagerThread() {
     return getSuspendContext().getManagerThread();
   }