diff --git a/java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java b/java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java
index 584b733aaa7c..f7507c9ac699 100644
--- a/java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java
+++ b/java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java
@@ -72,6 +72,7 @@ public class TreeClassChooserFactoryImpl extends TreeClassChooserFactory {
                                                         PsiClass base,
                                                         boolean acceptsSelf,
                                                         boolean acceptInner,
+                                                        @Nullable
                                                         Condition<? super PsiClass> additionalCondition) {
     ClassFilter classFilter = new TreeJavaClassChooserDialog.InheritanceJavaClassFilterImpl(base, acceptsSelf, acceptInner, additionalCondition);
     return new TreeJavaClassChooserDialog(title, myProject, scope, classFilter, base, null, false);
diff --git a/java/java-impl/src/com/intellij/ide/util/TreeJavaClassChooserDialog.java b/java/java-impl/src/com/intellij/ide/util/TreeJavaClassChooserDialog.java
index 994bddb9458c..14b356fa1959 100644
--- a/java/java-impl/src/com/intellij/ide/util/TreeJavaClassChooserDialog.java
+++ b/java/java-impl/src/com/intellij/ide/util/TreeJavaClassChooserDialog.java
@@ -63,15 +63,6 @@ public class TreeJavaClassChooserDialog extends AbstractTreeClassChooserDialog<P
     super(title, project, scope, PsiClass.class, createFilter(classFilter), baseClass, initialClass, isShowMembers, true);
   }
 
-  @Override
-  @Nullable
-  protected PsiClass getSelectedFromTreeUserObject(DefaultMutableTreeNode node) {
-    Object userObject = node.getUserObject();
-    if (!(userObject instanceof ClassTreeNode)) return null;
-    ClassTreeNode descriptor = (ClassTreeNode)userObject;
-    return descriptor.getPsiClass();
-  }
-
   public static TreeJavaClassChooserDialog withInnerClasses(String title,
                                                             @NotNull Project project,
                                                             GlobalSearchScope scope,
@@ -100,6 +91,15 @@ public class TreeJavaClassChooserDialog extends AbstractTreeClassChooserDialog<P
     }
   }
 
+  @Override
+  @Nullable
+  protected PsiClass getSelectedFromTreeUserObject(DefaultMutableTreeNode node) {
+    Object userObject = node.getUserObject();
+    if (!(userObject instanceof ClassTreeNode)) return null;
+    ClassTreeNode descriptor = (ClassTreeNode)userObject;
+    return descriptor.getPsiClass();
+  }
+
   @NotNull
   protected List<PsiClass> getClassesByName(final String name,
                                             final boolean checkBoxState,
@@ -146,11 +146,13 @@ public class TreeJavaClassChooserDialog extends AbstractTreeClassChooserDialog<P
     private final PsiClass myBase;
     private final boolean myAcceptsSelf;
     private final boolean myAcceptsInner;
+    @NotNull
     private final Condition<? super PsiClass> myAdditionalCondition;
 
     public InheritanceJavaClassFilterImpl(PsiClass base,
                                           boolean acceptsSelf,
                                           boolean acceptInner,
+                                          @Nullable
                                           Condition<? super PsiClass> additionalCondition) {
       myAcceptsSelf = acceptsSelf;
       myAcceptsInner = acceptInner;
diff --git a/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java b/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java
index 2a8d4cd65ded..93efff178aca 100644
--- a/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java
+++ b/java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java
@@ -68,6 +68,7 @@ public abstract class TreeClassChooserFactory {
                                                                  PsiClass base,
                                                                  boolean acceptsSelf,
                                                                  boolean acceptInner,
+                                                                 @Nullable
                                                                  Condition<? super PsiClass> additionalCondition);
 
   @NotNull