diff --git a/platform/util/src/com/intellij/util/WalkingState.java b/platform/util/src/com/intellij/util/WalkingState.java
index 9106b72fa6d2..c4bcb1db6081 100644
--- a/platform/util/src/com/intellij/util/WalkingState.java
+++ b/platform/util/src/com/intellij/util/WalkingState.java
@@ -48,8 +48,12 @@ public class WalkingState<T> {
     if (!startedWalking) {
       stopped = false;
       startedWalking = true;
-      walkChildren(element);
-      startedWalking = false;
+      try {
+        walkChildren(element);
+      }
+      finally {
+        startedWalking = false;
+      }
     }
   }