diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
index 9c094e255ca9..9b9a45c70c4d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -240,7 +240,14 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
       }
     });
     DebuggerSession session = new DebuggerSession(environment.getSessionName(), debugProcess);
-    final ExecutionResult executionResult = session.attach(environment);
+    ExecutionResult executionResult;
+    try {
+      executionResult = session.attach(environment);
+    }
+    catch (ExecutionException e) {
+      session.dispose();
+      throw e;
+    }
     if (executionResult == null) {
       return null;
     }