diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
index a9c80767e16b..e055d1ee5a03 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
@@ -55,7 +55,7 @@ public class GenericDebuggerRunner extends JavaPatchableProgramRunner<GenericDeb
                                                          ExecutionEnvironment env) throws ExecutionException {
     if (state instanceof JavaCommandLine) {
       final JavaParameters parameters = ((JavaCommandLine)state).getJavaParameters();
-      runCustomPatchers(parameters, env.getRunnerSettings(), executor);
+      runCustomPatchers(parameters, executor, env.getRunProfile());
       RemoteConnection connection = DebuggerManagerImpl.createDebugParameters(parameters, true, DebuggerSettings.getInstance().DEBUGGER_TRANSPORT, "", false);
       return attachVirtualMachine(project, executor, state, contentToReuse, env, connection, true);
     }
@@ -97,9 +97,9 @@ public class GenericDebuggerRunner extends JavaPatchableProgramRunner<GenericDeb
     return new GenericDebuggerRunnerSettings();
   }
 
-  public void patch(JavaParameters javaParameters, RunnerSettings settings, final boolean beforeExecution) throws ExecutionException {
+  public void patch(JavaParameters javaParameters, RunnerSettings settings, RunProfile runProfile, final boolean beforeExecution) throws ExecutionException {
     doPatch(javaParameters, settings);
-    runCustomPatchers(javaParameters, settings, Executor.EXECUTOR_EXTENSION_NAME.findExtension(DefaultDebugExecutor.class));
+    runCustomPatchers(javaParameters, Executor.EXECUTOR_EXTENSION_NAME.findExtension(DefaultDebugExecutor.class), runProfile);
   }
 
   private static RemoteConnection doPatch(final JavaParameters javaParameters, final RunnerSettings settings) throws ExecutionException {
diff --git a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
index 7b61bc79b3a6..daf7de9955f3 100644
--- a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
+++ b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
@@ -61,8 +61,8 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
   }
 
   @Override
-  public void patch(JavaParameters javaParameters, RunnerSettings settings, final boolean beforeExecution) throws ExecutionException {
-    runCustomPatchers(javaParameters, settings, Executor.EXECUTOR_EXTENSION_NAME.findExtension(DefaultRunExecutor.class));
+  public void patch(JavaParameters javaParameters, RunnerSettings settings, RunProfile runProfile, final boolean beforeExecution) throws ExecutionException {
+    runCustomPatchers(javaParameters, Executor.EXECUTOR_EXTENSION_NAME.findExtension(DefaultRunExecutor.class), runProfile);
   }
 
   @Override
@@ -74,7 +74,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
     boolean shouldAddDefaultActions = true;
     if (state instanceof JavaCommandLine) {
       final JavaParameters parameters = ((JavaCommandLine)state).getJavaParameters();
-      patch(parameters, env.getRunnerSettings(), true);
+      patch(parameters, env.getRunnerSettings(), env.getRunProfile(), true);
       final ProcessProxy proxy = ProcessProxyFactory.getInstance().createCommandLineProxy((JavaCommandLine)state);
       executionResult = state.execute(executor, this);
       if (proxy != null && executionResult != null) {
diff --git a/java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.java b/java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.java
index ed763fa911ee..702c8811bcfd 100644
--- a/java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.java
+++ b/java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.java
@@ -21,21 +21,21 @@ import com.intellij.execution.configurations.JavaParameters;
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.configurations.RunnerSettings;
 import com.intellij.openapi.util.JDOMExternalizable;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author spleaner
  */
 public abstract class JavaPatchableProgramRunner<Settings extends JDOMExternalizable> extends GenericProgramRunner<Settings> {
 
-  public abstract void patch(JavaParameters javaParameters, RunnerSettings settings, final boolean beforeExecution) throws ExecutionException;
+  public abstract void patch(JavaParameters javaParameters, RunnerSettings settings, RunProfile runProfile, final boolean beforeExecution) throws ExecutionException;
 
 
-  protected static void runCustomPatchers(JavaParameters javaParameters, @Nullable RunnerSettings settings, Executor executor) {
-    if (settings != null) {
-      final RunProfile profile = settings.getRunProfile();
+  protected static void runCustomPatchers(JavaParameters javaParameters,
+                                          Executor executor,
+                                          RunProfile runProfile) {
+    if (runProfile != null) {
       for (JavaProgramPatcher patcher : JavaProgramPatcher.EP_NAME.getExtensions()) {
-        patcher.patchJavaParameters(executor, profile, javaParameters);
+        patcher.patchJavaParameters(executor, runProfile, javaParameters);
       }
     }
   }