diff --git a/platform/util/src/com/intellij/util/WalkingState.java b/platform/util/src/com/intellij/util/WalkingState.java
index 5904db52b624..9106b72fa6d2 100644
--- a/platform/util/src/com/intellij/util/WalkingState.java
+++ b/platform/util/src/com/intellij/util/WalkingState.java
@@ -89,7 +89,9 @@ public class WalkingState<T> {
       }
       element = myWalker.getParent(element);
     }
-    elementFinished(element);
+    if (element != null) {
+      elementFinished(element);
+    }
     return null;
   }