diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java
index 9ccfb1664c64..50500c3864a7 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java
@@ -72,7 +72,13 @@ public class JavaDebugProcess extends XDebugProcess {
   private final XBreakpointHandler<?>[] myBreakpointHandlers;
   private final NodeManagerImpl myNodeManager;
 
-  public JavaDebugProcess(@NotNull final XDebugSession session, final DebuggerSession javaSession) {
+  public static JavaDebugProcess create(@NotNull final XDebugSession session, final DebuggerSession javaSession) {
+    JavaDebugProcess res = new JavaDebugProcess(session, javaSession);
+    javaSession.getProcess().setXDebugProcess(res);
+    return res;
+  }
+
+  private JavaDebugProcess(@NotNull final XDebugSession session, final DebuggerSession javaSession) {
     super(session);
     myJavaSession = javaSession;
     myEditorsProvider = new JavaDebuggerEditorsProvider();
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 db350c2b3d70..06408ce2a27a 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
@@ -122,9 +122,7 @@ public class GenericDebuggerRunner extends JavaPatchableProgramRunner<GenericDeb
           sessionImpl.addRestartActions(((DefaultExecutionResult)executionResult).getRestartActions());
           sessionImpl.addExtraStopActions(((DefaultExecutionResult)executionResult).getAdditionalStopActions());
         }
-        JavaDebugProcess res = new JavaDebugProcess(session, debuggerSession);
-        debugProcess.setXDebugProcess(res);
-        return res;
+        return JavaDebugProcess.create(session, debuggerSession);
       }
     }).getRunContentDescriptor();
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerPanelsManager.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerPanelsManager.java
index 14077c698284..bc093f7c233d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerPanelsManager.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerPanelsManager.java
@@ -35,7 +35,10 @@ import com.intellij.execution.executors.DefaultDebugExecutor;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.ExecutionEnvironmentBuilder;
 import com.intellij.execution.runners.ProgramRunner;
-import com.intellij.execution.ui.*;
+import com.intellij.execution.ui.ExecutionConsole;
+import com.intellij.execution.ui.RunContentDescriptor;
+import com.intellij.execution.ui.RunContentManager;
+import com.intellij.execution.ui.RunContentWithExecutorListener;
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
@@ -142,7 +145,7 @@ public class DebuggerPanelsManager implements ProjectComponent {
         @Override
         @NotNull
         public XDebugProcess start(@NotNull XDebugSession session) {
-          return new JavaDebugProcess(session, debuggerSession);
+          return JavaDebugProcess.create(session, debuggerSession);
         }
       });
     return debugSession.getRunContentDescriptor();
diff --git a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java
index 06ebf7875e6e..cefceb3977e0 100644
--- a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java
+++ b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java
@@ -169,7 +169,7 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas
             @Override
             @NotNull
             public XDebugProcess start(@NotNull XDebugSession session) {
-              return new JavaDebugProcess(session, myDebuggerSession);
+              return JavaDebugProcess.create(session, myDebuggerSession);
             }
           });
         }
@@ -471,7 +471,7 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas
       @Override
       @NotNull
       public XDebugProcess start(@NotNull XDebugSession session) {
-        return new JavaDebugProcess(session, debuggerSession);
+        return JavaDebugProcess.create(session, debuggerSession);
       }
     });
     return debuggerSession;