diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetObjectStub.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetObjectStub.java
index 81210be89fc..c7b264dc204 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetObjectStub.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetObjectStub.java
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.lang.psi.stubs;
 
 import com.intellij.psi.stubs.NamedStub;
-import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetObjectDeclaration;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 
@@ -25,6 +25,6 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
  * @author Nikolay Krasko
  */
 public interface PsiJetObjectStub extends NamedStub<JetObjectDeclaration> {
-    @NotNull
+    @Nullable
     FqName getFQName();
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java
index b788383ec81..873cc84e5a2 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java
@@ -69,22 +69,21 @@ public class JetObjectElementType extends JetStubElementType<PsiJetObjectStub, J
         assert name != null;
 
         FqName fqName = psi.getFqName();
-        assert fqName != null;
-
         return new PsiJetObjectStubImpl(JetStubElementTypes.OBJECT_DECLARATION, parentStub, name, fqName);
     }
 
     @Override
     public void serialize(PsiJetObjectStub stub, StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
-        dataStream.writeName(stub.getFQName().toString());
+        FqName fqName = stub.getFQName();
+        dataStream.writeName(fqName != null ? fqName.toString() : null);
     }
 
     @Override
     public PsiJetObjectStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef name = dataStream.readName();
         StringRef fqNameStr = dataStream.readName();
-        FqName fqName = new FqName(fqNameStr.toString());
+        FqName fqName = fqNameStr != null ? new FqName(fqNameStr.toString()) : null;
 
         return new PsiJetObjectStubImpl(JetStubElementTypes.OBJECT_DECLARATION, parentStub, name, fqName);
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java
index c34272f0af1..a93482ef083 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java
@@ -21,6 +21,7 @@ import com.intellij.psi.stubs.StubBase;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetObjectDeclaration;
 import org.jetbrains.jet.lang.psi.stubs.PsiJetObjectStub;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -36,7 +37,7 @@ public class PsiJetObjectStubImpl extends StubBase<JetObjectDeclaration> impleme
             @NotNull IStubElementType elementType,
             @NotNull StubElement parent,
             @NotNull String name,
-            @NotNull FqName fqName) {
+            @Nullable FqName fqName) {
         this(elementType, parent, StringRef.fromString(name), fqName);
     }
 
@@ -44,7 +45,7 @@ public class PsiJetObjectStubImpl extends StubBase<JetObjectDeclaration> impleme
             @NotNull IStubElementType elementType,
             @NotNull StubElement parent,
             @NotNull StringRef name,
-            @NotNull FqName fqName) {
+            @Nullable FqName fqName) {
         super(parent, elementType);
 
         this.name = name;
@@ -56,7 +57,7 @@ public class PsiJetObjectStubImpl extends StubBase<JetObjectDeclaration> impleme
         return StringRef.toString(name);
     }
 
-    @NotNull
+    @Nullable
     @Override
     public FqName getFQName() {
         return fqName;
@@ -68,7 +69,8 @@ public class PsiJetObjectStubImpl extends StubBase<JetObjectDeclaration> impleme
 
         builder.append("PsiJetObjectStubImpl[");
         builder.append("name=").append(getName());
-        builder.append(" fqName=").append(getFQName().toString());
+
+        builder.append(" fqName=").append(fqName != null ? fqName.toString() : "null");
         builder.append("]");
 
         return builder.toString();
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java b/idea/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java
index 7447d03f669..edaed2468db 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java
@@ -52,7 +52,11 @@ public class StubIndexServiceImpl implements StubIndexService {
         assert name != null;
 
         sink.occurrence(JetIndexKeys.SHORT_NAME_KEY, name);
-        sink.occurrence(JetIndexKeys.FQN_KEY, stub.getFQName().toString());
+
+        FqName fqName = stub.getFQName();
+        if (fqName != null) {
+            sink.occurrence(JetIndexKeys.FQN_KEY, fqName.toString());
+        }
     }
 
     @Override