diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java
index ed91828c3e13..0ac53a61fcf2 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java
@@ -356,6 +356,7 @@ public class PsiDiamondTypeUtil {
     PsiElementFactory factory = JavaPsiFacade.getInstance(element.getProject()).getElementFactory();
     for(PsiMethodCallExpression call : PsiTreeUtil.collectElementsOfType(element, PsiMethodCallExpression.class)) {
       PsiType[] arguments = call.getTypeArguments();
+      if (arguments.length == 0) continue;
       PsiMethod method = call.resolveMethod();
       if(method != null) {
         PsiTypeParameter[] parameters = method.getTypeParameters();