diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportNode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportNode.java
index 419c8de30ce6..287138fe8b69 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportNode.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportNode.java
@@ -79,6 +79,8 @@ public class FrameworkSupportNode extends CheckedTreeNode {
       return ((FrameworkVersionWithLibrary)version).getLibraryDescription();
     }
 
+    if (version.getLibraries().length == 0) return null;
+
     CustomLibraryDescription description = myLibraryDescriptions.get(version);
     if (description == null) {
       description = new CustomLibraryDescriptionImpl(version.getLibraries(), StringUtil.notNullize(version.getLibraryName()));
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/AddCustomLibraryDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/AddCustomLibraryDialog.java
index bf126b2f4436..cd81ce3f6ab7 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/AddCustomLibraryDialog.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/AddCustomLibraryDialog.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainer;
 import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainerFactory;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ParametrizedRunnable;
 import org.jetbrains.annotations.NotNull;
@@ -59,7 +60,9 @@ public class AddCustomLibraryDialog extends DialogWrapper {
     setTitle(IdeBundle.message("setup.library.dialog.title"));
     VirtualFile baseDir = myModule.getProject().getBaseDir();
     final String baseDirPath = baseDir != null ? baseDir.getPath() : "";
-    myPanel = new LibraryOptionsPanel(new LibraryCompositionSettings(description, baseDirPath), myLibrariesContainer, false);
+    final LibraryCompositionSettings settings = new LibraryCompositionSettings(description, baseDirPath);
+    Disposer.register(myDisposable, settings);
+    myPanel = new LibraryOptionsPanel(settings, myLibrariesContainer, false);
     init();
   }