diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
index dc973638162..8ce9e7435a6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
@@ -40,12 +40,12 @@ class IfThenToElvisIntention : SelfTargetingOffsetIndependentIntention<KtIfExpre
         "Replace 'if' expression with elvis expression"
 ) {
 
-    private fun IfThenToSelectData.clausesReplaceableByElvis() =
-            baseClause != null && negatedClause != null &&
-            !negatedClause.isNullOrBlockExpression() &&
-            (baseClause.evaluatesTo(receiverExpression) ||
-             baseClause.hasFirstReceiverOf(receiverExpression) && !baseClause.hasNullableType(context)) &&
-            !(negatedClause is KtThrowExpression && negatedClause.throwsNullPointerExceptionWithNoArguments())
+    private fun IfThenToSelectData.clausesReplaceableByElvis(): Boolean {
+        if (baseClause == null || negatedClause == null || negatedClause.isNullOrBlockExpression()) return false
+        if (negatedClause is KtThrowExpression && negatedClause.throwsNullPointerExceptionWithNoArguments()) return false
+        return baseClause.evaluatesTo(receiverExpression) ||
+               baseClause.hasFirstReceiverOf(receiverExpression) && !baseClause.hasNullableType(context)
+    }
 
     override fun isApplicableTo(element: KtIfExpression): Boolean {
         val ifThenToSelectData = element.buildSelectTransformationData() ?: return false