From 7a60448d2dd969690a39908a58d9bde71f4d9325 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Mon, 22 Jul 2013 14:13:14 +0200
Subject: [PATCH] EA-47886 - IAE: TypeConversionUtil.isAssignable

---
 java/java-psi-api/src/com/intellij/psi/LambdaUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java b/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
index 7202ecd99d3e..72b114da7399 100644
--- a/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
@@ -574,7 +574,7 @@ public class LambdaUtil {
     final PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(project).getResolveHelper();
     for (PsiTypeParameter typeParameter : typeParameters) {
       final PsiType constraint = resolveHelper.getSubstitutionForTypeParameter(typeParameter, returnType, interfaceMethodReturnType, false, languageLevel);
-      if (constraint != PsiType.NULL) {
+      if (constraint != PsiType.NULL && constraint != null) {
         PsiType inferredType = null;
         final PsiClassType[] bounds = typeParameter.getExtendsListTypes();
         for (PsiClassType classTypeBound : bounds) {