diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/AssignmentWithIfExpressionToStatementIntention.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/AssignmentWithIfExpressionToStatementIntention.java
index f77daf3c149..8b900164bdf 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/AssignmentWithIfExpressionToStatementIntention.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/AssignmentWithIfExpressionToStatementIntention.java
@@ -46,7 +46,8 @@ public class AssignmentWithIfExpressionToStatementIntention extends BaseIntentio
 
         while (element != null) {
             if (CodeTransformationUtils.checkAssignmentWithIfExpression(element)) return (JetBinaryExpression)element;
-            element = PsiTreeUtil.getParentOfType(element, JetBinaryExpression.class, false);
+            PsiElement parent = PsiTreeUtil.getParentOfType(element, JetBinaryExpression.class, false);
+            element = (element != parent) ? parent : null;
         }
 
         return null;