diff --git a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifactInfo.java b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifactInfo.java
index 9344d310b7c1..d04fb9e87400 100644
--- a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifactInfo.java
+++ b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifactInfo.java
@@ -95,6 +95,7 @@ public class MavenArtifactInfo implements Serializable {
     MavenId.append(builder, myPackaging);
     if (!StringUtil.isEmptyOrSpaces(myClassifier)) MavenId.append(builder, myClassifier);
     MavenId.append(builder, myVersion);
+    MavenId.append(builder, myRepositoryId);
 
     return builder.toString();
   }
diff --git a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenRepositoryInfo.java b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenRepositoryInfo.java
index dd9fd21dc93b..2e3a5667fce4 100644
--- a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenRepositoryInfo.java
+++ b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenRepositoryInfo.java
@@ -39,4 +39,15 @@ public class MavenRepositoryInfo implements Serializable {
   public String getUrl() {
     return myUrl;
   }
+
+  @Override
+  public String toString() {
+    StringBuilder builder = new StringBuilder();
+
+    MavenId.append(builder, myId);
+    MavenId.append(builder, myName);
+    MavenId.append(builder, myUrl);
+
+    return builder.toString();
+  }
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java
index 0f865a7b1d29..20153960c5a9 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java
@@ -90,8 +90,8 @@ public class RepositoryAttachDialog extends DialogWrapper {
     myProject = project;
     myProgressIcon.suspend();
     myCaptionLabel.setText(
-      XmlStringUtil.wrapInHtml(StringUtil.escapeXml("enter keyword, pattern or class name to search by or Maven coordinates," +
-                                                    "i.e. 'springframework', 'Logger' or 'org.hibernate:hibernate-core:3.5.0.GA':")
+      XmlStringUtil.wrapInHtml(StringUtil.escapeXml("keyword or class name to search by or exact Maven coordinates, " +
+                                                    "i.e. 'spring', 'Logger' or 'ant:ant-junit:1.6.5'")
       ));
     myInfoLabel.setPreferredSize(
       new Dimension(myInfoLabel.getFontMetrics(myInfoLabel.getFont()).stringWidth("Showing: 1000"), myInfoLabel.getPreferredSize().height));
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryAttachHandler.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryAttachHandler.java
index 2ae2f0010224..81e63c3d51cb 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryAttachHandler.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryAttachHandler.java
@@ -222,7 +222,11 @@ public class RepositoryAttachHandler {
                   tooManyResults = true;
                 }
                 else {
-                  resultList.add(Pair.create(artifact, map.get(artifact.getRepositoryId())));
+                  MavenRepositoryInfo repository = map.get(artifact.getRepositoryId());
+                  // if the artifact is provided by an unsupported repository just skip it
+                  // because it won't be resolved anyway
+                  if (repository == null) continue;
+                  resultList.add(Pair.create(artifact, repository));
                 }
               }
             }