diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/ui/ExpressionEditorWithHistory.java b/java/debugger/impl/src/com/intellij/debugger/memory/ui/ExpressionEditorWithHistory.java index 71931b68a94d..8122b2c2657d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/memory/ui/ExpressionEditorWithHistory.java +++ b/java/debugger/impl/src/com/intellij/debugger/memory/ui/ExpressionEditorWithHistory.java @@ -50,10 +50,12 @@ class ExpressionEditorWithHistory extends XDebuggerExpressionEditor { ApplicationManager.getApplication().executeOnPooledThread(()-> ApplicationManager.getApplication().runReadAction(() -> { - final PsiClass psiClass = DebuggerUtils.findClass(className, - project, GlobalSearchScope.allScope(project)); - ApplicationManager.getApplication().invokeLater(() -> setContext(psiClass)); - })); + if (!project.isDisposed()) { + final PsiClass psiClass = DebuggerUtils.findClass(className, + project, GlobalSearchScope.allScope(project)); + ApplicationManager.getApplication().invokeLater(() -> setContext(psiClass), project.getDisposed()); + } + })); } private void showHistory() {