diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java
index 68960570a24..5fce1656fca 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java
@@ -40,6 +40,7 @@ public class JetCodeBlockModificationListener implements PsiTreeChangePreprocess
 
     @Override
     public void treeChanged(final PsiTreeChangeEventImpl event) {
+        if (!(event.getFile() instanceof JetFile)) return;
         switch (event.getCode()) {
             case BEFORE_CHILDREN_CHANGE:
             case BEFORE_PROPERTY_CHANGE:
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java
index c872f68a80d..3459b1d91fb 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java
@@ -125,6 +125,7 @@ public class JetLightClass extends AbstractLightClass implements JetJavaMirrorMa
             answer = CachedValuesManager.getManager(getProject()).createCachedValue(new CachedValueProvider<PsiJavaFileStub>() {
                 @Override
                 public Result<PsiJavaFileStub> compute() {
+                    //System.out.println("Calculating Java stub for " + file.getName() + ", OOCB modcount " + PsiModificationTracker.SERVICE.getInstance(getProject()).getOutOfCodeBlockModificationCount());
                     return Result.create(calcStub(), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
                 }
             }, false);