diff --git a/src/app/language-mode.coffee b/src/app/language-mode.coffee
index 8aea107d6..85148f3a7 100644
--- a/src/app/language-mode.coffee
+++ b/src/app/language-mode.coffee
@@ -37,7 +37,7 @@ class LanguageMode
       autoCompleteOpeningBracket = @isOpeningBracket(text) and not hasWordAfterCursor and not (@isQuote(text) and hasWordBeforeCursor)
       skipOverExistingClosingBracket = false
       if @isClosingBracket(text) and nextCharacter == text
-        if bracketMarker = _.find(@bracketMarkers, (marker) => @editSession.getMarkerBufferRange(marker).end.isEqual(cursorBufferPosition))
+        if bracketMarker = _.find(@bracketMarkers, (marker) => @editSession.getMarkerBufferRange(marker)?.end.isEqual(cursorBufferPosition))
           skipOverExistingClosingBracket = true
 
       if skipOverExistingClosingBracket