diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/infos/MethodCandidateInfo.java b/java-language-api/src/main/java/com/intellij/java/language/psi/infos/MethodCandidateInfo.java
index d650605c8..85f7a4be8 100644
--- a/java-language-api/src/main/java/com/intellij/java/language/psi/infos/MethodCandidateInfo.java
+++ b/java-language-api/src/main/java/com/intellij/java/language/psi/infos/MethodCandidateInfo.java
@@ -480,7 +480,7 @@ public boolean isInferencePossible() {
 
     public static CurrentCandidateProperties getCurrentMethod(PsiElement context) {
         Map<PsiElement, CurrentCandidateProperties> currentMethodCandidates = CURRENT_CANDIDATE.get();
-        return currentMethodCandidates != null ? currentMethodCandidates.get(context) : null;
+        return currentMethodCandidates != null && context != null ? currentMethodCandidates.get(context) : null;
     }
 
     public static void updateSubstitutor(PsiElement context, PsiSubstitutor newSubstitutor) {