diff --git a/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
index 57c30fa5449a..a9ac4262a9c1 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
@@ -71,6 +71,8 @@ public class PsiTypeVisitor<A> {
   @Nullable
   public A visitLambdaExpressionType(PsiLambdaExpressionType lambdaExpressionType) {
     final PsiLambdaExpression lambdaExpression = lambdaExpressionType.getExpression();
-    return visitType(lambdaExpression.getFunctionalInterfaceType());
+    final PsiType interfaceType = lambdaExpression.getFunctionalInterfaceType();
+    if (interfaceType != null) return interfaceType.accept(this);
+    return visitType(interfaceType);
   }
 }