diff --git a/platform/projectModel-api/src/org/jetbrains/concurrency/AsyncPromise.kt b/platform/projectModel-api/src/org/jetbrains/concurrency/AsyncPromise.kt
index 501e9492da86..6cae878095ec 100644
--- a/platform/projectModel-api/src/org/jetbrains/concurrency/AsyncPromise.kt
+++ b/platform/projectModel-api/src/org/jetbrains/concurrency/AsyncPromise.kt
@@ -10,7 +10,8 @@ import java.util.concurrent.*
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.function.Consumer
 
-open class AsyncPromise<T> private constructor(private val f: CompletableFuture<T>, private val hasErrorHandler: AtomicBoolean) : CancellablePromise<T>, InternalPromiseUtil.CompletablePromise<T> {
+open class AsyncPromise<T> private constructor(private val f: CompletableFuture<T>,
+                                               private val hasErrorHandler: AtomicBoolean) : CancellablePromise<T>, InternalPromiseUtil.CompletablePromise<T> {
   constructor() : this(CompletableFuture(), AtomicBoolean())
 
   override fun isDone() = f.isDone
diff --git a/platform/script-debugger/backend/src/rpc/CommandSenderBase.kt b/platform/script-debugger/backend/src/rpc/CommandSenderBase.kt
index 40751ebea271..ad476cc19556 100644
--- a/platform/script-debugger/backend/src/rpc/CommandSenderBase.kt
+++ b/platform/script-debugger/backend/src/rpc/CommandSenderBase.kt
@@ -19,15 +19,10 @@ abstract class CommandSenderBase<SUCCESS_RESPONSE> {
 class RequestPromise<SUCCESS_RESPONSE, RESULT : Any?>(private val methodName: String?) : AsyncPromise<RESULT>(), RequestCallback<SUCCESS_RESPONSE> {
   override fun onSuccess(response: SUCCESS_RESPONSE?, resultReader: ResultReader<SUCCESS_RESPONSE>?) {
     catchError {
-      val r: Any?
-      if (resultReader == null || response == null) {
-        r = response
-      }
-      else if (methodName == null) {
-        r = null
-      }
-      else {
-        r = resultReader.readResult(methodName, response)
+      val r = when {
+        resultReader == null || response == null -> response
+        methodName == null -> null
+        else -> resultReader.readResult(methodName, response)
       }
 
       UnsafeSetResult.setResult(this, r)