diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/IncompleteHierarchyException.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/IncompleteHierarchyException.java
index 29c56c81abc5..169398be0aa3 100644
--- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/IncompleteHierarchyException.java
+++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/IncompleteHierarchyException.java
@@ -22,6 +22,9 @@ class IncompleteHierarchyException extends Exception {
   @SuppressWarnings("ThrowableInstanceNeverThrown")
   public static final IncompleteHierarchyException INSTANCE = new IncompleteHierarchyException();
 
+  private IncompleteHierarchyException() {
+  }
+
   @Override
   public synchronized Throwable fillInStackTrace() {
     return this;
diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/QualifiedName.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/QualifiedName.java
index d83a05d50d8a..5bac1e4d5857 100644
--- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/QualifiedName.java
+++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/QualifiedName.java
@@ -60,7 +60,7 @@ abstract class QualifiedName {
   }
 
   static class Interned extends QualifiedName {
-    @QNameId final int id;
+    @QNameHash final int id;
 
     Interned(int id) {
       this.id = id;
@@ -71,7 +71,7 @@ abstract class QualifiedName {
       throws IncompleteHierarchyException {
       Symbol.ClassSymbol[] candidates = resolver.findGlobalType(id);
       if (candidates.length == 0) {
-        throw new IncompleteHierarchyException();
+        throw IncompleteHierarchyException.INSTANCE;
       }
 
       Collections.addAll(result, candidates);