diff --git a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
index 55cbdf836530..8064655edb19 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
@@ -50,6 +50,7 @@ public class NameUtilTest extends UsefulTestCase {
     assertMatches("NaUtTe", "NameUtilTest");
     assertMatches("AACl", "AAClass");
     assertMatches("ZZZ", "ZZZZZZZZZZ");
+    assertMatches("", "");
   }
 
   public void testSkipWords() {
diff --git a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
index 8e5974caa8e2..f20d33e03c35 100644
--- a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
+++ b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
@@ -133,6 +133,9 @@ public class MinusculeMatcher implements Matcher {
       return null;
     }
     if (!isWildcard(patternIndex)) {
+      if (patternIndex == myPattern.length) {
+        return FList.emptyList();
+      }
       return matchFragment(name, patternIndex, nameIndex);
     }