diff --git a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt
index d2e2c149ea1..0dc9621801a 100644
--- a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt
+++ b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt
@@ -286,7 +286,7 @@ class PartialBodyResolveFilter(
             }
 
             override fun visitIfExpression(expression: JetIfExpression) {
-                expression.getCondition().accept(this)
+                expression.getCondition()?.accept(this)
 
                 val thenBranch = expression.getThen()
                 val elseBranch = expression.getElse()
@@ -308,7 +308,7 @@ class PartialBodyResolveFilter(
             }
 
             override fun visitWhileExpression(loop: JetWhileExpression) {
-                val condition = loop.getCondition()
+                val condition = loop.getCondition() ?: return
                 if (condition.isTrueConstant()) {
                     insideLoopLevel++
                     loop.getBody()?.accept(this)
@@ -316,7 +316,7 @@ class PartialBodyResolveFilter(
                 }
                 else {
                     // do not make sense to search exits inside while-loop as not necessary enter it at all
-                    condition?.accept(this)
+                    condition.accept(this)
                 }
             }