diff --git a/java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java b/java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java
index c0f876789983..ddff081ff953 100644
--- a/java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java
+++ b/java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java
@@ -84,20 +84,20 @@ public class TreeClassChooserDialog extends DialogWrapper implements TreeClassCh
     this(title, project, null);
   }
 
-  public TreeClassChooserDialog(String title, Project project, PsiClass initialClass) {
+  public TreeClassChooserDialog(String title, Project project, @Nullable PsiClass initialClass) {
     this(title, project, GlobalSearchScope.projectScope(project), null, initialClass);
   }
 
-  public TreeClassChooserDialog(String title, Project project, GlobalSearchScope scope, ClassFilter classFilter, PsiClass initialClass) {
+  public TreeClassChooserDialog(String title, Project project, GlobalSearchScope scope, @Nullable ClassFilter classFilter, @Nullable PsiClass initialClass) {
     this(title, project, scope, classFilter, null, initialClass, PsiClassChildrenSource.NONE);
   }
 
   public TreeClassChooserDialog(String title,
                                 Project project,
                                 GlobalSearchScope scope,
-                                ClassFilter classFilter,
+                                @Nullable ClassFilter classFilter,
                                 PsiClass baseClass,
-                                PsiClass initialClass,
+                                @Nullable PsiClass initialClass,
                                 PsiClassChildrenSource classChildrens) {
     super(project, true);
     myScope = scope;
@@ -119,7 +119,7 @@ public class TreeClassChooserDialog extends DialogWrapper implements TreeClassCh
                                                         Project project,
                                                         GlobalSearchScope scope,
                                                         final ClassFilter classFilter,
-                                                        PsiClass initialClass) {
+                                                        @Nullable PsiClass initialClass) {
     return new TreeClassChooserDialog(title, project, scope, classFilter, null, initialClass, new PsiClassChildrenSource() {
       public void addChildren(PsiClass psiClass, List<PsiElement> children) {
         ArrayList<PsiElement> innerClasses = new ArrayList<PsiElement>();
diff --git a/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java b/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java
index 231181d0fc24..6e0afd853e07 100644
--- a/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java
+++ b/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java
@@ -40,18 +40,18 @@ public abstract class TreeClassChooserFactory {
   public abstract TreeClassChooser createWithInnerClassesScopeChooser(String title,
                                                                       GlobalSearchScope scope,
                                                                       final TreeClassChooser.ClassFilter classFilter,
-                                                                      PsiClass initialClass);
+                                                                      @Nullable PsiClass initialClass);
 
 
   @NotNull
   public abstract TreeClassChooser createNoInnerClassesScopeChooser(String title,
                                                                     GlobalSearchScope scope,
                                                                     TreeClassChooser.ClassFilter classFilter,
-                                                                    PsiClass initialClass);
+                                                                    @Nullable PsiClass initialClass);
 
 
   @NotNull
-  public abstract TreeClassChooser createProjectScopeChooser(String title, PsiClass initialClass);
+  public abstract TreeClassChooser createProjectScopeChooser(String title, @Nullable PsiClass initialClass);
 
 
   @NotNull