diff --git a/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java b/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java
index 5730b4d790ab..e11c897d50fb 100644
--- a/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java
+++ b/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java
@@ -26,6 +26,7 @@ import com.intellij.refactoring.listeners.RefactoringElementAdapter;
 import com.intellij.refactoring.listeners.RefactoringElementListener;
 import com.intellij.refactoring.listeners.UndoRefactoringElementListener;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class RefactoringListeners {
   public static RefactoringElementListener getListener(final PsiPackage psiPackage, final Accessor<PsiPackage> accessor) {
@@ -112,6 +113,7 @@ public class RefactoringListeners {
       }
     }
 
+    @Nullable
     protected abstract T findNewElement(T newParent, String qualifiedName);
 
     protected abstract String getQualifiedName(T element);
@@ -141,9 +143,14 @@ public class RefactoringListeners {
       super(accessor, path);
     }
 
+    @Nullable
     public PsiClass findNewElement(final PsiClass psiClass, final String qualifiedName) {
+      final Module module = JavaExecutionUtil.findModule(psiClass);
+      if (module == null) {
+        return null;
+      }
       return JavaPsiFacade.getInstance(psiClass.getProject())
-        .findClass(qualifiedName.replace('$', '.'), GlobalSearchScope.moduleScope(JavaExecutionUtil.findModule(psiClass)));
+        .findClass(qualifiedName.replace('$', '.'), GlobalSearchScope.moduleScope(module));
     }
 
     public String getQualifiedName(final PsiClass psiClass) {
@@ -156,10 +163,15 @@ public class RefactoringListeners {
       super(accessor, "*");
     }
 
+    @Nullable
     public PsiClass findNewElement(final PsiClass psiClass, final String qualifiedName) {
+      final Module module = JavaExecutionUtil.findModule(psiClass);
+      if (module == null) {
+        return null;
+      }
       return JavaPsiFacade.getInstance(psiClass.getProject())
         .findClass(qualifiedName.replace('$', '.').replace("\\*", psiClass.getName()), 
-                   GlobalSearchScope.moduleScope(JavaExecutionUtil.findModule(psiClass)));
+                   GlobalSearchScope.moduleScope(module));
     }
 
     public String getQualifiedName(final PsiClass psiClass) {