diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java index 55adb44cdd2a..b49be436ad4a 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java @@ -1032,7 +1032,9 @@ public final class XDebugSessionImpl implements XDebugSession { if (mySessionTab != null) { AppUIUtil.invokeOnEdt(() -> { mySessionTab.getUi().attractBy(XDebuggerUIConstants.LAYOUT_VIEW_FINISH_CONDITION); - ((XWatchesViewImpl)mySessionTab.getWatchesView()).updateSessionData(); + if (!myProject.isDisposed()) { + ((XWatchesViewImpl)mySessionTab.getWatchesView()).updateSessionData(); + } mySessionTab.detachFromSession(); }); }