diff --git a/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java b/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
index 3cb289656276..b221a829268b 100644
--- a/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
+++ b/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
@@ -77,7 +77,7 @@ public abstract class RunManagerEx extends RunManager {
 
   public abstract Collection<RunnerAndConfigurationSettings> getSortedConfigurations();
 
-  public abstract void removeConfiguration(RunnerAndConfigurationSettings settings);
+  public abstract void removeConfiguration(@Nullable RunnerAndConfigurationSettings settings);
 
   public abstract void addRunManagerListener(RunManagerListener listener);
   public abstract void removeRunManagerListener(RunManagerListener listener);
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
index c911d2a89ba7..f0e6a15f6206 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
@@ -311,7 +311,9 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable,
   }
 
   @Override
-  public void removeConfiguration(RunnerAndConfigurationSettings settings) {
+  public void removeConfiguration(@Nullable RunnerAndConfigurationSettings settings) {
+    if (settings == null) return;
+
     for (Iterator<RunnerAndConfigurationSettings> it = getSortedConfigurations().iterator(); it.hasNext(); ) {
       final RunnerAndConfigurationSettings configuration = it.next();
       if (configuration.equals(settings)) {