From 389eff6ef9d31c54364592238d8652e94512c8a4 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Wed, 29 Nov 2017 09:36:31 +0700
Subject: [PATCH] GuessManagerImpl: null-check. Fixed EA-113310

---
 .../com/intellij/codeInsight/guess/impl/GuessManagerImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java
index bc26dc22f1c2..5d7c9139d783 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java
@@ -437,7 +437,7 @@ public class GuessManagerImpl extends GuessManager {
         if (type instanceof PsiIntersectionType) {
           myResult.putValues((PsiExpression)myForPlace, Arrays.asList(((PsiIntersectionType)type).getConjuncts()));
         }
-        else {
+        else if (type != null) {
           myResult.putValue((PsiExpression)myForPlace, type);
         }
       }