diff --git a/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java b/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java
index d6df75cd5c04..e34390e6f645 100644
--- a/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java
+++ b/java/execution/impl/src/com/intellij/execution/RunConfigurationExtension.java
@@ -31,6 +31,8 @@ import com.intellij.openapi.options.SettingsEditorGroup;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.WriteExternalException;
+import com.intellij.psi.PsiElement;
+import com.intellij.refactoring.listeners.RefactoringElementListener;
 import com.intellij.ui.LayeredIcon;
 import org.jdom.Element;
 import org.jetbrains.annotations.Nullable;
@@ -58,6 +60,21 @@ public abstract class RunConfigurationExtension {
   public abstract void patchConfiguration(RunConfigurationBase runJavaConfiguration);
   public abstract void checkConfiguration(RunConfigurationBase runJavaConfiguration) throws RuntimeConfigurationException;
 
+  public RefactoringElementListener wrapElementListener(PsiElement element,
+                                                        RunConfigurationBase runJavaConfiguration,
+                                                        RefactoringElementListener listener) {
+    return listener;
+  }
+
+  public static RefactoringElementListener wrapRefactoringElementListener(PsiElement element,
+                                                                          RunConfigurationBase runConfigurationBase,
+                                                                          RefactoringElementListener listener) {
+    for (RunConfigurationExtension extension : Extensions.getExtensions(EP_NAME)) {
+      listener = extension.wrapElementListener(element, runConfigurationBase, listener);
+    }
+    return listener;
+  }
+
   public static  void appendEditors(RunConfigurationBase configuration, SettingsEditorGroup group) {
     for (RunConfigurationExtension extension : Extensions.getExtensions(EP_NAME)) {
       final SettingsEditor editor = extension.createEditor(configuration);
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
index 901685def43a..5287087da48e 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -103,8 +103,9 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
   }
 
   public RefactoringElementListener getRefactoringElementListener(final PsiElement element) {
-    return RefactoringListeners.
+    final RefactoringElementListener listener = RefactoringListeners.
       getClassOrPackageListener(element, new RefactoringListeners.SingleClassConfigurationAccessor(this));
+    return RunConfigurationExtension.wrapRefactoringElementListener(element, this, listener);
   }
 
   @Nullable
diff --git a/java/openapi/src/com/intellij/codeInsight/NullableNotNullManager.java b/java/openapi/src/com/intellij/codeInsight/NullableNotNullManager.java
index 004d5b7861c1..b1c5b0eb553a 100644
--- a/java/openapi/src/com/intellij/codeInsight/NullableNotNullManager.java
+++ b/java/openapi/src/com/intellij/codeInsight/NullableNotNullManager.java
@@ -48,6 +48,8 @@ public class NullableNotNullManager implements PersistentStateComponent<Element>
   public static final String[] DEFAULT_NULLABLES = {AnnotationUtil.NULLABLE, "javax.annotation.Nullable", "edu.umd.cs.findbugs.annotations.Nullable"};
   public static final String[] DEFAULT_NOT_NULLS = {AnnotationUtil.NOT_NULL, "javax.annotation.Nonnull",  "edu.umd.cs.findbugs.annotations.NonNull"};
 
+  private static final Object LOCK = new Object();
+
   public static NullableNotNullManager getInstance(Project project) {
     return ServiceManager.getService(project, NullableNotNullManager.class);
   }
@@ -90,13 +92,6 @@ public class NullableNotNullManager implements PersistentStateComponent<Element>
     myDefaultNotNull = defaultNotNull;
   }
 
-  public List<String> getNullables() {
-    if (myNullables.isEmpty()) {
-      Collections.addAll(myNullables, DEFAULT_NULLABLES);
-    }
-    return myNullables;
-  }
-
   public boolean isNullable(PsiModifierListOwner owner, boolean checkBases) {
     return AnnotationUtil.isAnnotated(owner, getNullables(), checkBases);
   }
@@ -105,9 +100,24 @@ public class NullableNotNullManager implements PersistentStateComponent<Element>
     return AnnotationUtil.isAnnotated(owner, getNotNulls(), checkBases);
   }
 
+  public List<String> getNullables() {
+    if (myNullables.isEmpty()) {
+      synchronized (LOCK) {
+        if (myNullables.isEmpty()) {
+          Collections.addAll(myNullables, DEFAULT_NULLABLES);
+        }
+      }
+    }
+    return myNullables;
+  }
+
   public List<String> getNotNulls() {
     if (myNotNulls.isEmpty()) {
-      Collections.addAll(myNotNulls, DEFAULT_NOT_NULLS);
+      synchronized (LOCK) {
+        if (myNotNulls.isEmpty()) {
+          Collections.addAll(myNotNulls, DEFAULT_NOT_NULLS);
+        }
+      }
     }
     return myNotNulls;
   }
diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
index b9000c3ce422..dd3c56934bc0 100644
--- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
+++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
@@ -93,7 +93,8 @@ public class JUnitConfiguration extends ModuleBasedConfiguration<JavaRunConfigur
   }
 
   public RefactoringElementListener getRefactoringElementListener(final PsiElement element) {
-    return myData.getTestObject(getProject(), this).getListener(element, this);
+    final RefactoringElementListener listener = myData.getTestObject(getProject(), this).getListener(element, this);
+    return RunConfigurationExtension.wrapRefactoringElementListener(element, this, listener);
   }
 
   public String getGeneratedName() {
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
index 528db8a75384..a12c01192498 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
@@ -47,7 +47,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.testng.xml.Parser;
 
-import java.io.FileInputStream;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -380,20 +379,23 @@ public class TestNGConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
   public RefactoringElementListener getRefactoringElementListener(final PsiElement element) {
     if (data.TEST_OBJECT.equals(TestType.PACKAGE.getType())) {
       if (!(element instanceof PsiPackage)) return null;
-      return RefactoringListeners.getListener((PsiPackage)element, myPackage);
+      final RefactoringElementListener listener = RefactoringListeners.getListener((PsiPackage)element, myPackage);
+      return RunConfigurationExtension.wrapRefactoringElementListener(element, this, listener);
     }
     else if (data.TEST_OBJECT.equals(TestType.CLASS.getType())) {
       if (!(element instanceof PsiClass)) return null;
-      return RefactoringListeners.getClassOrPackageListener(element, myClass);
+      final RefactoringElementListener listener = RefactoringListeners.getClassOrPackageListener(element, myClass);
+      return RunConfigurationExtension.wrapRefactoringElementListener(element, this, listener);
     }
     else if (data.TEST_OBJECT.equals(TestType.METHOD.getType())) {
       if (!(element instanceof PsiMethod)) {
-        return RefactoringListeners.getClassOrPackageListener(element, myClass);
+        final RefactoringElementListener listener = RefactoringListeners.getClassOrPackageListener(element, myClass);
+        return RunConfigurationExtension.wrapRefactoringElementListener(element, this, listener);
       }
       final PsiMethod method = (PsiMethod)element;
       if (!method.getName().equals(data.getMethodName())) return null;
       if (!method.getContainingClass().equals(myClass.getPsiElement())) return null;
-      return new RefactoringElementListener() {
+      final RefactoringElementListener listener = new RefactoringElementListener() {
         public void elementMoved(@NotNull final PsiElement newElement) {
           setMethod((PsiMethod)newElement);
         }
@@ -408,6 +410,7 @@ public class TestNGConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
           if (generatedName) setGeneratedName();
         }
       };
+      return RunConfigurationExtension.wrapRefactoringElementListener(element, this, listener);
     }
     return null;
   }