diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 331b499e53e..c6c3c19bbea 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -1675,7 +1675,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes if (!signature.isEmpty()) { JetNamedFunction altFunDeclaration = JetPsiFactory.createFunction(project, signature); valueParameterDescriptors = computeAlternativeValueParameters(valueParameterDescriptors, altFunDeclaration); - returnType = computeAlternativeTypeFromAnnotation(altFunDeclaration.getReturnTypeRef().getTypeElement(), returnType); + JetTypeReference returnTypeRef = altFunDeclaration.getReturnTypeRef(); + if (returnTypeRef != null) { + returnType = computeAlternativeTypeFromAnnotation(returnTypeRef.getTypeElement(), returnType); + } } functionDescriptorImpl.initialize(