From b7b0eaff220d3e8a8c26e741c29059e66a56bce2 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 25 Mar 2015 13:06:44 +0100
Subject: [PATCH] IDEA-137929 NPE at
 com.intellij.openapi.roots.impl.storage.ClasspathStorage$MyStorageData.access$002

---
 .../intellij/openapi/roots/impl/storage/ClasspathStorage.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java
index 1a1eef8a246c..df75b15ae75c 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java
@@ -157,7 +157,9 @@ public class ClasspathStorage extends StateStorageBase<ClasspathStorage.MyStorag
   public void analyzeExternalChangesAndUpdateIfNeed(@NotNull Collection<VirtualFile> changedFiles, @NotNull Set<String> componentNames) {
     // if some file changed, so, changed
     componentNames.add("NewModuleRootManager");
-    myStorageData.loaded = false;
+    if (myStorageData != null) {
+      myStorageData.loaded = false;
+    }
   }
 
   @Nullable