diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/FirstPassData.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/FirstPassData.java
index 30427b54108c..abbf6c46cda0 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/FirstPassData.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/FirstPassData.java
@@ -167,9 +167,6 @@ class FirstPassData implements Function<@NotNull String, @NotNull String> {
     }
     catch (Exception ignored) {
     }
-    if (visitor.mapping.isEmpty()) {
-      return EMPTY;
-    }
     String varArgComponent = null;
     if (visitor.canonicalSignature != null) {
       visitor.canonicalSignature.append(")V");
@@ -177,6 +174,9 @@ class FirstPassData implements Function<@NotNull String, @NotNull String> {
         varArgComponent = visitor.lastComponent;
       }
     }
+    if (varArgComponent == null && visitor.mapping.isEmpty()) {
+      return EMPTY;
+    }
     return new FirstPassData(visitor.mapping, varArgComponent);
   }
 }