diff --git a/platform/script-debugger/debugger-ui/src/ProcessHandlerWrapper.kt b/platform/script-debugger/debugger-ui/src/ProcessHandlerWrapper.kt
index 9d2998ba5445..ec11a5f41f38 100644
--- a/platform/script-debugger/debugger-ui/src/ProcessHandlerWrapper.kt
+++ b/platform/script-debugger/debugger-ui/src/ProcessHandlerWrapper.kt
@@ -51,7 +51,7 @@ class ProcessHandlerWrapper(private val debugProcess: XDebugProcess, private val
     }
 
     debugProcess.stopAsync()
-      .onSuccess() { stopProcess(destroy) }
+      .onSuccess { stopProcess(destroy) }
       .onError {
         try {
           LOG.error(it)
diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugProcess.java b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugProcess.java
index 348f71bdcc02..20ce93fb7766 100644
--- a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugProcess.java
+++ b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugProcess.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.intellij.xdebugger;
 
@@ -169,7 +167,7 @@ public abstract class XDebugProcess {
   }
 
   @NotNull
-  public Promise stopAsync() {
+  public Promise<Void> stopAsync() {
     stop();
     return Promises.resolvedPromise();
   }
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
index f7471995588f..9675955f535d 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
@@ -890,7 +890,6 @@ public class XDebugSessionImpl implements XDebugSession {
       removeBreakpointListeners();
     }
     finally {
-      //noinspection unchecked
       myDebugProcess.stopAsync().onSuccess(aVoid -> {
         if (!myProject.isDisposed()) {
           myProject.getMessageBus().syncPublisher(XDebuggerManager.TOPIC).processStopped(myDebugProcess);