diff --git a/source/com/intellij/codeInsight/highlighting/BraceMatchingUtil.java b/source/com/intellij/codeInsight/highlighting/BraceMatchingUtil.java
index af8081b639f9..7f0a6b6d8c9b 100644
--- a/source/com/intellij/codeInsight/highlighting/BraceMatchingUtil.java
+++ b/source/com/intellij/codeInsight/highlighting/BraceMatchingUtil.java
@@ -243,7 +243,7 @@ public class BraceMatchingUtil {
     }
 
     public IElementType getTokenType(char ch, HighlighterIterator iterator) {
-      final IElementType tokenType = iterator.getTokenType();
+      final IElementType tokenType = (!iterator.atEnd())?iterator.getTokenType():null;
 
       if(tokenType instanceof IJavaElementType) {
         if (ch == '}') return JavaTokenType.RBRACE;