diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java index 09e8410f14d9..e77b06481673 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java @@ -429,7 +429,9 @@ public class ProjectManagerImpl extends ProjectManagerEx implements Disposable { ? LoadingPhase.PROJECT_OPENED : LoadingPhase.INDEXING_FINISHED); - startupManager.scheduleBackgroundPostStartupActivities(); + if (!project.isDisposed()) { + startupManager.scheduleBackgroundPostStartupActivities(); + } }, ModalityState.NON_MODAL); }));