diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
index c54e265f197f..d482d56fa3af 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
@@ -208,12 +208,7 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo
         PsiExpression returnValue = statement.getReturnValue();
         if (returnValue == null) return;
 
-        PsiElement element = PsiTreeUtil.getParentOfType(statement, PsiMethod.class, PsiLambdaExpression.class);
-        if (element == null) return;
-        
-        PsiType returnType = element instanceof PsiMethod ? ((PsiMethod)element).getReturnType() : LambdaUtil.getFunctionalInterfaceReturnType((PsiFunctionalExpression)element);
-        
-        checkCollectionNullityOnAssignment(statement.getReturnValue(), returnType, returnValue);
+        checkCollectionNullityOnAssignment(statement.getReturnValue(), PsiTypesUtil.getMethodReturnType(statement), returnValue);
       }
 
       @Override