diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
index 4b892ac12562..9d44258deaa1 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
@@ -212,7 +212,8 @@ class JdkComboBox extends JComboBox{
     final DefaultComboBoxModel model = ((DefaultComboBoxModel)getModel());
     model.removeAllElements();
     model.addElement(firstItem);
-    final ArrayList<Sdk> projectJdks = new ArrayList<Sdk>(ProjectJdksModel.getInstance(project).getProjectJdks().values());
+    final ProjectJdksModel projectJdksModel = ProjectStructureConfigurable.getInstance(project).getProjectJdksModel();
+    final ArrayList<Sdk> projectJdks = new ArrayList<Sdk>(projectJdksModel.getProjectJdks().values());
     Collections.sort(projectJdks, new Comparator<Sdk>() {
       public int compare(final Sdk o1, final Sdk o2) {
         return o1.getName().compareToIgnoreCase(o2.getName());
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdksConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdksConfigurable.java
index 284853e27b6b..7fbd1a4ed2d0 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdksConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdksConfigurable.java
@@ -64,7 +64,7 @@ public class ProjectJdksConfigurable extends MasterDetailsComponent implements C
   public ProjectJdksConfigurable(Project project) {
     super();
     myProject = project;
-    myProjectJdksModel = ProjectJdksModel.getInstance(project);
+    myProjectJdksModel = ProjectStructureConfigurable.getInstance(project).getProjectJdksModel();
     MasterDetailsStateService.getInstance(project).register("ProjectJDKs.UI", this);
     initTree();
   }
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java
index 66a9150e7d04..b5993de2ac5d 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java
@@ -63,9 +63,10 @@ public class UIRootConfigurationAccessor extends RootConfigurationAccessor {
   }
 
   public Sdk getProjectSdk(final Project project) {
-    return ProjectJdksModel.getInstance(project).getProjectJdk();
+    return ProjectStructureConfigurable.getInstance(project).getProjectJdksModel().getProjectJdk();
   }
 
+  @Nullable
   public String getProjectSdkName(final Project project) {
     final String projectJdkName = ProjectRootManager.getInstance(project).getProjectJdkName();
     final Sdk projectJdk = getProjectSdk(project);
@@ -73,7 +74,8 @@ public class UIRootConfigurationAccessor extends RootConfigurationAccessor {
       return projectJdk.getName();
     }
     else {
-      return ProjectJdksModel.getInstance(project).findSdk(projectJdkName) == null ? projectJdkName : null;
+      final ProjectJdksModel projectJdksModel = ProjectStructureConfigurable.getInstance(project).getProjectJdksModel();
+      return projectJdksModel.findSdk(projectJdkName) == null ? projectJdkName : null;
     }
   }
 }
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectJdksModel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectJdksModel.java
index 13574a9daf2a..e4ddceefed43 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectJdksModel.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectJdksModel.java
@@ -58,11 +58,6 @@ public class ProjectJdksModel implements NotifiableSdkModel {
   private Sdk myProjectJdk;
   private boolean myInitialized = false;
 
-  public static ProjectJdksModel getInstance(Project project){
-    return ProjectStructureConfigurable.getInstance(project).getProjectJdksModel();
-  }
-
-
   public Listener getMulticaster() {
     return mySdkEventsDispatcher.getMulticaster();
   }
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java
index c4780ad0278d..ab33bd5434a8 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java
@@ -45,6 +45,7 @@ public class RootConfigurationAccessor {
     return ProjectRootManager.getInstance(project).getProjectJdk();
   }
 
+  @Nullable
   public String getProjectSdkName(final Project project) {
     return ProjectRootManager.getInstance(project).getProjectJdkName();
   }