diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java
index 14d4a8172d73..098cd7a8f674 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java
@@ -197,7 +197,6 @@ public class FileBasedStorage extends XmlElementStorage {
 
   @Override
   protected void loadState(final StorageData result, final Element element) throws StateStorageException {
-    ((FileStorageData)result).myFileName = myFile.getAbsolutePath();
     ((FileStorageData)result).myFilePath = myFile.getAbsolutePath();
     super.loadState(result, element);
   }
@@ -210,7 +209,6 @@ public class FileBasedStorage extends XmlElementStorage {
 
   public static class FileStorageData extends StorageData {
     String myFilePath;
-    String myFileName;
 
     public FileStorageData(final String rootElementName) {
       super(rootElementName);
@@ -218,7 +216,6 @@ public class FileBasedStorage extends XmlElementStorage {
 
     protected FileStorageData(FileStorageData storageData) {
       super(storageData);
-      myFileName = storageData.myFileName;
       myFilePath = storageData.myFilePath;
     }
 
@@ -229,7 +226,7 @@ public class FileBasedStorage extends XmlElementStorage {
 
     @NonNls
     public String toString() {
-      return "FileStorageData[" + myFileName + "]";
+      return "FileStorageData[" + myFilePath + "]";
     }
   }
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelfManagerConfigurationMerger.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelfManagerConfigurationMerger.java
index 7597e6919bd5..d521801ea253 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelfManagerConfigurationMerger.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelfManagerConfigurationMerger.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.options.StreamProvider;
 import org.jdom.Attribute;
 import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.*;
@@ -41,6 +42,7 @@ public class ShelfManagerConfigurationMerger implements XmlConfigurationMerger {
     myFileProcessor = new CompoundShelfFileProcessor(streamProviders, configPath);
   }
 
+  @NotNull
   public Element merge(final Element serverElement, final Element localElement) {
 
     Map<Date, ShelvedChangeList> result = new LinkedHashMap<Date, ShelvedChangeList>();