diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java
index 325a7a91d2fd..59b641ded9e8 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java
@@ -62,7 +62,9 @@ public class FacetEditorFacadeImpl implements FacetEditorFacade {
   private void addFacetNode(Facet facet) {
     addFacetNode(facet, myStructureConfigurable.findModuleNode(facet.getModule()));
     final FacetStructureConfigurable facetStructureConfigurable = FacetStructureConfigurable.getInstance(myStructureConfigurable.getProject());
-    facetStructureConfigurable.addFacetNode(facetStructureConfigurable.findFacetTypeNode(facet.getType()), facet, this);
+    final MasterDetailsComponent.MyNode facetTypeNode = facetStructureConfigurable.findFacetTypeNode(facet.getType());
+    LOG.assertTrue(facetTypeNode != null, "Cannot found node for " + facet.getType());
+    facetStructureConfigurable.addFacetNode(facetTypeNode, facet, this);
   }
 
   private MasterDetailsComponent.MyNode addFacetNode(final Facet facet, final MasterDetailsComponent.MyNode moduleNode) {
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
index 984a383e681f..597615be4395 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
@@ -100,7 +100,7 @@ public class FacetStructureConfigurable extends BaseStructureConfigurable {
     return findNodeByObject(myRoot, facetType);
   }
 
-  public void addFacetNode(MyNode facetTypeNode, Facet facet, FacetEditorFacadeImpl editorFacade) {
+  public void addFacetNode(@NotNull MyNode facetTypeNode, @NotNull Facet facet, @NotNull FacetEditorFacadeImpl editorFacade) {
     FacetConfigurable facetConfigurable = editorFacade.getOrCreateConfigurable(facet);
     addNode(new FacetConfigurableNode(facetConfigurable), facetTypeNode);
   }