diff --git a/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaPairedBraceMatcher.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaPairedBraceMatcher.java
index f11c40ff4bfc..af53c35d6e97 100644
--- a/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaPairedBraceMatcher.java
+++ b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaPairedBraceMatcher.java
@@ -23,7 +23,6 @@ import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.JavaTokenType;
 import com.intellij.psi.impl.source.tree.StdTokenSets;
 import com.intellij.psi.tree.IElementType;
-import com.intellij.util.ArrayUtil;
 
 public class JavaPairedBraceMatcher extends PairedBraceMatcherAdapter {
   public JavaPairedBraceMatcher() {
@@ -58,12 +57,12 @@ public class JavaPairedBraceMatcher extends PairedBraceMatcherAdapter {
     try {
       while (true) {
         count++;
-        if (iterator.atEnd()) break;
         if (left) {
           iterator.advance();
         } else {
           iterator.retreat();
         }
+        if (iterator.atEnd()) break;
         final IElementType tokenType = iterator.getTokenType();
         if (tokenType == opposite) {
           paired--;
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/highlighting/JavaBraceMatcherTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/highlighting/JavaBraceMatcherTest.java
index 97f59458f676..ca527ff68658 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/highlighting/JavaBraceMatcherTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/highlighting/JavaBraceMatcherTest.java
@@ -30,6 +30,18 @@ public class JavaBraceMatcherTest extends LightCodeInsightFixtureTestCase {
     assertTrue(offset == 54);
   }
 
+  public void testBrokenText() {
+    myFixture.configureByText("a.java", "import java.util.ArrayList;" +
+                                        "class A {" +
+                                        "  ArrayList<caret><String");
+    final Editor editor = myFixture.getEditor();
+    final EditorHighlighter editorHighlighter = ((EditorEx)editor).getHighlighter();
+    final HighlighterIterator iterator = editorHighlighter.createIterator(editor.getCaretModel().getOffset());
+    boolean matched = BraceMatchingUtil.matchBrace(editor.getDocument().getCharsSequence(), myFixture.getFile().getFileType(), iterator,
+                                                   true);
+    assertFalse(matched);
+  }
+
   public void testBinaryStatement() {
     myFixture.configureByText("a.java", "import java.util.ArrayList;" +
                                         "class A {" +