1 files changed, 8 insertions, 4 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/BaseFileConfigurableStoreImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/BaseFileConfigurableStoreImpl.java
index 25dd8a05cab3..dc07fee151e2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/BaseFileConfigurableStoreImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/BaseFileConfigurableStoreImpl.java
@@ -59,8 +59,8 @@ abstract class BaseFileConfigurableStoreImpl extends ComponentStoreImpl {
     }
 
     @Override
-    public void load(@NotNull final Element rootElement) throws IOException {
-      super.load(rootElement);
+    public void load(@NotNull Element rootElement, @Nullable PathMacroSubstitutor pathMacroSubstitutor, boolean intern) {
+      super.load(rootElement, pathMacroSubstitutor, intern);
 
       final String v = rootElement.getAttributeValue(VERSION_OPTION);
       if (v != null) {
@@ -74,7 +74,11 @@ abstract class BaseFileConfigurableStoreImpl extends ComponentStoreImpl {
     @Override
     @NotNull
     protected Element save() {
-      final Element root = super.save();
+      Element root = super.save();
+      if (root == null) {
+        root = new Element(myRootElementName);
+      }
+
       root.setAttribute(VERSION_OPTION, Integer.toString(myVersion));
       return root;
     }
@@ -113,7 +117,7 @@ abstract class BaseFileConfigurableStoreImpl extends ComponentStoreImpl {
   }
 
   public BaseStorageData getMainStorageData() throws StateStorageException {
-    return (BaseStorageData) getMainStorage().getStorageData(false);
+    return (BaseStorageData)getMainStorage().getStorageData();
   }
 
   @Nullable