From cb0636749aae795d305b51375f7d0167674e21fd Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Wed, 14 Dec 2016 11:04:45 +0100
Subject: [PATCH] @NotNull

---
 .../intellij/codeInsight/completion/JavaInheritorsGetter.java   | 2 +-
 java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaInheritorsGetter.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaInheritorsGetter.java
index d2c226c79c24..66d7649bc0b7 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaInheritorsGetter.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaInheritorsGetter.java
@@ -189,7 +189,7 @@ public class JavaInheritorsGetter extends CompletionProvider<CompletionParameter
   private static boolean areInferredTypesApplicable(@NotNull PsiType[] types, PsiElement position) {
     final PsiNewExpression newExpression = PsiTreeUtil.getParentOfType(position, PsiNewExpression.class, false);
     if (!PsiUtil.isLanguageLevel8OrHigher(position)) {
-      return PsiTypesUtil.getExpectedTypeByParent(newExpression) != null;
+      return newExpression != null && PsiTypesUtil.getExpectedTypeByParent(newExpression) != null;
     }
     final PsiCallExpression methodCallExpression = PsiTreeUtil.getParentOfType(newExpression, PsiCallExpression.class, false, PsiStatement.class);
     if (methodCallExpression != null && PsiUtil.isLanguageLevel8OrHigher(methodCallExpression)) {
diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
index 1e5c492976ce..3a33e1b834b0 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
@@ -204,7 +204,7 @@ public class PsiTypesUtil {
    * Return type explicitly declared in parent
    */
   @Nullable
-  public static PsiType getExpectedTypeByParent(PsiElement element) {
+  public static PsiType getExpectedTypeByParent(@NotNull PsiElement element) {
     final PsiElement parent = PsiUtil.skipParenthesizedExprUp(element.getParent());
     if (parent instanceof PsiVariable) {
       if (PsiUtil.checkSameExpression(element, ((PsiVariable)parent).getInitializer())) {