diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalSystemJdkComboBox.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalSystemJdkComboBox.java index 4a1d89817cfd..d2ca6e62157b 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalSystemJdkComboBox.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalSystemJdkComboBox.java @@ -156,7 +156,7 @@ public class ExternalSystemJdkComboBox extends ComboBoxWithWidePopup { )); } - if (myProject != null) { + if (myProject != null && !myProject.isDisposed()) { final Sdk projectSdk = ProjectRootManager.getInstance(myProject).getProjectSdk(); result.put(ExternalSystemJdkUtil.USE_PROJECT_JDK, new JdkComboBoxItem(