diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
index b08f55ee78f6..e963ec91c2fc 100644
--- a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
+++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
@@ -835,7 +835,14 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
       }
     }
     final String text = stripTypeParameters(el.getText());
-    final boolean equalsIgnorePackage = MatchUtils.compareWithNoDifferenceToPackage(text, stripTypeParameters(el2.getText()));
+    String text2;
+    if (el2 instanceof PsiClass) {
+      text2 = ((PsiClass)el2).getQualifiedName();
+    } else {
+      text2 = el2.getText();
+    }
+
+    final boolean equalsIgnorePackage = MatchUtils.compareWithNoDifferenceToPackage(text, stripTypeParameters(text2));
     if (equalsIgnorePackage || !(el2 instanceof PsiJavaReference)) {
       return equalsIgnorePackage;
     }
@@ -846,7 +853,7 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
         return text.equals(((PsiClass)element2).getQualifiedName());
       }
       else {
-        return MatchUtils.compareWithNoDifferenceToPackage(text, el2.getText());
+        return MatchUtils.compareWithNoDifferenceToPackage(text, text2);
       }
     }
   }
diff --git a/platform/platform-impl/src/com/intellij/idea/IdeaLogger.java b/platform/platform-impl/src/com/intellij/idea/IdeaLogger.java
index 67a7c0f88532..8722a7ee84a2 100644
--- a/platform/platform-impl/src/com/intellij/idea/IdeaLogger.java
+++ b/platform/platform-impl/src/com/intellij/idea/IdeaLogger.java
@@ -121,7 +121,7 @@ public class IdeaLogger extends Logger {
   @Override
   public void error(String message, @Nullable Throwable t, @NotNull String... details) {
     if (t instanceof ProcessCanceledException) {
-      myLogger.error(new Throwable("Do not log ProcessCanceledException").initCause(t));
+      myLogger.error(message, new Throwable("Do not log ProcessCanceledException").initCause(t));
       throw (ProcessCanceledException)t;
     }