diff --git a/compiler/frontend/src/org/jetbrains/jet/storage/ExceptionTracker.kt b/compiler/frontend/src/org/jetbrains/jet/storage/ExceptionTracker.kt
new file mode 100644
index 00000000000..0d294e8d21f
--- /dev/null
+++ b/compiler/frontend/src/org/jetbrains/jet/storage/ExceptionTracker.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.storage
+
+import com.intellij.openapi.util.ModificationTracker
+import java.util.concurrent.atomic.AtomicLong
+import org.jetbrains.jet.utils.rethrow
+
+public class ExceptionTracker : ModificationTracker, LockBasedStorageManager.ExceptionHandlingStrategy {
+    private val cancelledTracker: AtomicLong = AtomicLong()
+
+    override fun handleException(throwable: Throwable): RuntimeException {
+        incCounter()
+        throw rethrow(throwable)
+    }
+
+    private fun incCounter() {
+        cancelledTracker.getAndIncrement()
+    }
+
+    override fun getModificationCount(): Long {
+        return cancelledTracker.get()
+    }
+
+    override fun toString(): String {
+        return getClass().getName() + ": " + getModificationCount()
+    }
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/storage/LockBasedStorageManagerWithExceptionTracking.java b/compiler/frontend/src/org/jetbrains/jet/storage/LockBasedStorageManagerWithExceptionTracking.java
new file mode 100644
index 00000000000..bf992b00c13
--- /dev/null
+++ b/compiler/frontend/src/org/jetbrains/jet/storage/LockBasedStorageManagerWithExceptionTracking.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.storage;
+
+import org.jetbrains.annotations.NotNull;
+
+public class LockBasedStorageManagerWithExceptionTracking extends LockBasedStorageManager {
+    @NotNull
+    public static LockBasedStorageManagerWithExceptionTracking create() {
+        return new LockBasedStorageManagerWithExceptionTracking(new ExceptionTracker());
+    }
+
+    private final ExceptionTracker tracker;
+
+    public LockBasedStorageManagerWithExceptionTracking(@NotNull ExceptionTracker tracker) {
+        super(tracker);
+        this.tracker = tracker;
+    }
+
+    @NotNull
+    public ExceptionTracker getTracker() {
+        return tracker;
+    }
+}
diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java b/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java
index cbdea4b9840..f132863e759 100644
--- a/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java
+++ b/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java
@@ -81,7 +81,7 @@ public class LockBasedStorageManager implements StorageManager {
         this(getPointOfConstruction(), ExceptionHandlingStrategy.THROW, new ReentrantLock());
     }
 
-    private LockBasedStorageManager(@NotNull ExceptionHandlingStrategy exceptionHandlingStrategy) {
+    protected LockBasedStorageManager(@NotNull ExceptionHandlingStrategy exceptionHandlingStrategy) {
         this(getPointOfConstruction(), exceptionHandlingStrategy, new ReentrantLock());
     }