diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingCommonModuleMethodDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingCommonModuleMethodDiagnostic.java
index d7c34f23edb..849a2e356c0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingCommonModuleMethodDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingCommonModuleMethodDiagnostic.java
@@ -54,10 +54,9 @@ public class MissingCommonModuleMethodDiagnostic extends AbstractDiagnostic {
   public static final String PRIVATE_METHOD_MESSAGE = "privateMethod";
   private final LocationRepository locationRepository;
 
-  private static String getMethodNameByLocation(ParserRuleContext node, Range range) {
+  private static Optional<String> getMethodNameByLocation(ParserRuleContext node, Range range) {
     return Trees.findTerminalNodeContainsPosition(node, range.getStart())
-      .map(ParseTree::getText)
-      .orElseThrow();
+      .map(ParseTree::getText);
   }
 
   @Override
@@ -88,9 +87,9 @@ private Optional<CallData> getReferenceToMethodCall(SymbolOccurrence symbolOccur
     if (methodSymbol.isEmpty()) {
       final var location = symbolOccurrence.location();
       // Нельзя использовать symbol.getSymbolName(), т.к. имя в нижнем регистре
-      return Optional.of(
-        new CallData(mdObject.get().getName(),
-          getMethodNameByLocation(documentContext.getAst(), location.getRange()),
+      return getMethodNameByLocation(documentContext.getAst(), location.getRange())
+        .map(methodName -> new CallData(mdObject.get().getName(),
+          methodName,
           location.getRange(), false, false));
     }
     // вызовы приватных методов внутри самого модуля пропускаем