diff --git a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerIndexer.java b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerIndexer.java
index 084c7bb878f5..04c39eae311a 100644
--- a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerIndexer.java
+++ b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerIndexer.java
@@ -33,7 +33,7 @@ public interface MavenServerIndexer extends Remote {
   String SEARCH_TERM_CLASS_NAMES = "c";
 
   int createIndex(@NotNull String indexId,
-                  @Nullable String repositoryId,
+                  @NotNull String repositoryId,
                   @Nullable File file,
                   @Nullable String url,
                   @NotNull File indexDir) throws RemoteException, MavenServerIndexerException;
diff --git a/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/Maven2ServerIndexerImpl.java b/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/Maven2ServerIndexerImpl.java
index dc961e9b5372..e6a2e05761db 100644
--- a/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/Maven2ServerIndexerImpl.java
+++ b/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/Maven2ServerIndexerImpl.java
@@ -72,7 +72,7 @@ public class Maven2ServerIndexerImpl extends MavenRemoteObject implements MavenS
   }
 
   public int createIndex(@NotNull String indexId,
-                         @Nullable String repositoryId,
+                         @NotNull String repositoryId,
                          @Nullable File file,
                          @Nullable String url,
                          @NotNull File indexDir) throws MavenServerIndexerException {
diff --git a/plugins/maven/maven2-server-impl/test/org/jetbrains/idea/maven/embedder/MavenFacadeEmbedderTest.java b/plugins/maven/maven2-server-impl/test/org/jetbrains/idea/maven/embedder/MavenServerEmbedderTest.java
similarity index 99%
rename from plugins/maven/maven2-server-impl/test/org/jetbrains/idea/maven/embedder/MavenFacadeEmbedderTest.java
rename to plugins/maven/maven2-server-impl/test/org/jetbrains/idea/maven/embedder/MavenServerEmbedderTest.java
index 92e50300e8a0..94c7a3998f51 100644
--- a/plugins/maven/maven2-server-impl/test/org/jetbrains/idea/maven/embedder/MavenFacadeEmbedderTest.java
+++ b/plugins/maven/maven2-server-impl/test/org/jetbrains/idea/maven/embedder/MavenServerEmbedderTest.java
@@ -35,7 +35,7 @@ import java.rmi.RemoteException;
 import java.util.Arrays;
 import java.util.Collections;
 
-public class MavenFacadeEmbedderTest extends MavenImportingTestCase {
+public class MavenServerEmbedderTest extends MavenImportingTestCase {
   private MavenEmbedderWrapper myEmbedder;
   private Maven2ServerEmbedderImpl myEmbedderImpl;
 
diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java
index 801ac3b0cea5..0e4d468297f3 100644
--- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java
+++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java
@@ -45,7 +45,7 @@ public class Maven3ServerImpl extends MavenRemoteObject implements MavenServer {
 
   public MavenServerIndexer createIndexer() throws RemoteException {
     try {
-      Maven3FacadeIndexerImpl result = new Maven3FacadeIndexerImpl();
+      Maven3ServerIndexerImpl result = new Maven3ServerIndexerImpl();
       UnicastRemoteObject.exportObject(result, 0);
       return result;
     }
diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3FacadeIndexerImpl.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java
similarity index 95%
rename from plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3FacadeIndexerImpl.java
rename to plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java
index c318dfde4662..3cb7e03a0008 100644
--- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3FacadeIndexerImpl.java
+++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java
@@ -27,10 +27,10 @@ import java.rmi.RemoteException;
 import java.util.Collection;
 import java.util.Set;
 
-public class Maven3FacadeIndexerImpl extends MavenRemoteObject implements MavenServerIndexer {
+public class Maven3ServerIndexerImpl extends MavenRemoteObject implements MavenServerIndexer {
   @Override
   public int createIndex(@NotNull String indexId,
-                         @Nullable String repositoryId,
+                         @NotNull String repositoryId,
                          @Nullable File file,
                          @Nullable String url,
                          @NotNull File indexDir) throws RemoteException, MavenServerIndexerException {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java
index 2287de4b486b..12db1dd36064 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java
@@ -156,7 +156,7 @@ public class MavenIndex {
         doOpen();
       }
       catch (Exception e1) {
-        MavenLog.LOG.info(e1);
+        MavenLog.LOG.warn(e1);
         try {
           doOpen();
         }
@@ -223,7 +223,7 @@ public class MavenIndex {
       }
     }
     catch (IOException e) {
-      MavenLog.LOG.info(e);
+      MavenLog.LOG.warn(e);
     }
   }
 
@@ -291,15 +291,13 @@ public class MavenIndex {
 
   private void handleUpdateException(Exception e) {
     myFailureMessage = e.getMessage();
-    MavenLog.LOG.info("Failed to update Maven indices for: [" + myRepositoryId + "] " + myRepositoryPathOrUrl, e);
+    MavenLog.LOG.warn("Failed to update Maven indices for: [" + myRepositoryId + "] " + myRepositoryPathOrUrl, e);
   }
 
   private int createContext(File contextDir, String suffix) throws MavenServerIndexerException {
     String indexId = myDir.getName() + "-" + suffix;
-    // Nexus cannot update index if the id does not equal to the stored one.
-    String repoId = contextDir.exists() ? null : myDir.getName();
     return myIndexer.createIndex(indexId,
-                                 repoId,
+                                 myRepositoryId,
                                  getRepositoryFile(),
                                  getRepositoryUrl(),
                                  contextDir);
@@ -661,7 +659,7 @@ public class MavenIndex {
         if (indexId != 0 && releaseIndexContext) myIndexer.releaseIndex(indexId);
       }
       catch (MavenServerIndexerException e) {
-        MavenLog.LOG.info(e);
+        MavenLog.LOG.warn(e);
         if (exceptions[0] == null) exceptions[0] = new MavenIndexException(e);
       }
 
@@ -680,7 +678,7 @@ public class MavenIndex {
         if (enumerator != null) enumerator.close();
       }
       catch (IOException e) {
-        MavenLog.LOG.info(e);
+        MavenLog.LOG.warn(e);
         if (exceptions[0] == null) exceptions[0] = new MavenIndexException(e);
       }
     }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenIndexerWrapper.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenIndexerWrapper.java
index 3b49cdea682a..592b893a492c 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenIndexerWrapper.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenIndexerWrapper.java
@@ -50,7 +50,7 @@ public abstract class MavenIndexerWrapper extends RemoteObjectWrapper<MavenServe
   }
 
   public synchronized int createIndex(@NotNull final String indexId,
-                                      @Nullable final String repositoryId,
+                                      @NotNull final String repositoryId,
                                       @Nullable final File file,
                                       @Nullable final String url,
                                       @NotNull final File indexDir) throws MavenServerIndexerException {
@@ -186,7 +186,7 @@ public abstract class MavenIndexerWrapper extends RemoteObjectWrapper<MavenServe
     private int remoteId = -1;
 
     private final @NotNull String indexId;
-    private final @Nullable String repositoryId;
+    private final @NotNull String repositoryId;
     private final @Nullable File file;
     private final @Nullable String url;
     private final @NotNull File indexDir;
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java
index 325b4285da4d..67fb844f7a3c 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java
@@ -100,6 +100,36 @@ public class MavenProjectIndicesManagerTest extends MavenIndicesTestCase {
     myIndicesFixture.getProjectIndicesManager().scheduleUpdateAll();
     assertUnorderedElementsAreEqual(myIndicesFixture.getProjectIndicesManager().getGroupIds(), "test", "jmock");
 
+    updateSettingsXmlFully("<settings>" +
+                           "  <mirrors>" +
+                           "    <mirror>" +
+                           "      <id>nexus</id>" +
+                           "      <mirrorOf>anotherRepoId</mirrorOf>" +
+                           "      <url>file:///" + myIndicesFixture.getRepositoryHelper().getTestDataPath("remote_mirror") + "</url>" +
+                           "    </mirror>" +
+                           "  </mirrors>" +
+                           "</settings>");
+
+    myIndicesFixture.getProjectIndicesManager().scheduleUpdateAll();
+    assertUnorderedElementsAreEqual(myIndicesFixture.getProjectIndicesManager().getGroupIds(), "test", "jmock");
+
+    updateSettingsXmlFully("<settings>" +
+                           "  <mirrors>" +
+                           "    <mirror>" +
+                           "      <id>nexus</id>" +
+                           "      <mirrorOf>central</mirrorOf>" +
+                           "      <url>file:///" + myIndicesFixture.getRepositoryHelper().getTestDataPath("remote_mirror") + "</url>" +
+                           "    </mirror>" +
+                           "  </mirrors>" +
+                           "</settings>");
+
+    myIndicesFixture.getProjectIndicesManager().scheduleUpdateAll();
+    assertUnorderedElementsAreEqual(myIndicesFixture.getProjectIndicesManager().getGroupIds(), "test", "jmock", "junit");
+
+    myIndicesFixture.tearDown();
+    myIndicesFixture = new MavenIndicesTestFixture(myDir, myProject, "local2", "remote_mirror");
+    myIndicesFixture.setUp();
+
     updateSettingsXmlFully("<settings>" +
                            "  <mirrors>" +
                            "    <mirror>" +
@@ -112,6 +142,7 @@ public class MavenProjectIndicesManagerTest extends MavenIndicesTestCase {
 
     myIndicesFixture.getProjectIndicesManager().scheduleUpdateAll();
     assertUnorderedElementsAreEqual(myIndicesFixture.getProjectIndicesManager().getGroupIds(), "test", "jmock", "junit");
+
   }
 
   public void testCheckingLocalRepositoryForAbsentIndices() throws Exception {