diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibrarySupport.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibrarySupport.java
index 3323f5b5045f..4cfe9f909279 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibrarySupport.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibrarySupport.java
@@ -68,22 +68,18 @@ public class RepositoryLibrarySupport {
     }
     final DependencyScope dependencyScope = LibraryDependencyScopeSuggester.getDefaultScope(library);
     final ModifiableRootModel moduleModifiableModel = modifiableModelsProvider.getModuleModifiableModel(module);
-    try {
-      LibraryOrderEntry foundEntry =
-        (LibraryOrderEntry)Iterables.find(Arrays.asList(moduleModifiableModel.getOrderEntries()), new Predicate<OrderEntry>() {
-          @Override
-          public boolean apply(@Nullable OrderEntry entry) {
-            return entry instanceof LibraryOrderEntry
-                   && ((LibraryOrderEntry)entry).getScope() == dependencyScope
-                   && isLibraryEqualsToSelected(((LibraryOrderEntry)entry).getLibrary());
-          }
-        }, null);
-      if (foundEntry == null) {
-        rootModel.addLibraryEntry(library).setScope(dependencyScope);
-      }
-    }
-    finally {
-      moduleModifiableModel.dispose();
+    LibraryOrderEntry foundEntry =
+      (LibraryOrderEntry)Iterables.find(Arrays.asList(moduleModifiableModel.getOrderEntries()), new Predicate<OrderEntry>() {
+        @Override
+        public boolean apply(@Nullable OrderEntry entry) {
+          return entry instanceof LibraryOrderEntry
+                 && ((LibraryOrderEntry)entry).getScope() == dependencyScope
+                 && isLibraryEqualsToSelected(((LibraryOrderEntry)entry).getLibrary());
+        }
+      }, null);
+    modifiableModelsProvider.disposeModuleModifiableModel(moduleModifiableModel);
+    if (foundEntry == null) {
+      rootModel.addLibraryEntry(library).setScope(dependencyScope);
     }
   }
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryType.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryType.java
index 62e834e06db3..f4fb4bbd9520 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryType.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryType.java
@@ -74,7 +74,11 @@ public class RepositoryLibraryType extends LibraryType<RepositoryLibraryProperti
     if (properties == null || !(properties instanceof RepositoryLibraryProperties)) {
       return MavenIcons.MavenLogo;
     }
-    return RepositoryLibraryDescription.findDescription((RepositoryLibraryProperties)properties).getIcon();
+    RepositoryLibraryProperties repositoryLibraryProperties = (RepositoryLibraryProperties)properties;
+    if (repositoryLibraryProperties.getGroupId() == null || repositoryLibraryProperties.getArtifactId() == null) {
+      return MavenIcons.MavenLogo;
+    }
+    return RepositoryLibraryDescription.findDescription(repositoryLibraryProperties).getIcon();
   }
 
   @NotNull