diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java
index 44393bdb50b7..cdb20a4a3f7c 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java
@@ -159,7 +159,10 @@ public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootL
       model.inheritSdk();
     }
 
-    myPanel.forceInitFromModel();
+    if (myPanel != null) {
+      myPanel.forceInitFromModel();
+    }
+
     flushChangesToModel();
 
     return oldSdk;