2 files changed, 3 insertions, 7 deletions
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/CompiledPattern.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/CompiledPattern.java
index 565f80ac01ce..70c1cdccd03e 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/CompiledPattern.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/CompiledPattern.java
@@ -82,7 +82,7 @@ public abstract class CompiledPattern {
   public boolean isRealTypedVar(PsiElement element) {
     if (element!=null && element.getTextLength()>0) {
       String str = getTypedVarString(element);
-      if (str.length()==0) {
+      if (str == null || str.length()==0) {
         return false;
       }
       return isTypedVar( str );
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/PatternCompiler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/PatternCompiler.java
index e290ebb70793..6dba855121cb 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/PatternCompiler.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/PatternCompiler.java
@@ -272,12 +272,8 @@ public class PatternCompiler {
 
     element.accept(new PsiRecursiveElementWalkingVisitor() {
       @Override
-      public void visitElement(PsiElement element) {
-        super.visitElement(element);
-
-        if (!(element instanceof PsiErrorElement)) {
-          return;
-        }
+      public void visitErrorElement(PsiErrorElement element) {
+        super.visitErrorElement(element);
 
         final int startOffset = element.getTextRange().getStartOffset();