diff --git a/source/com/intellij/psi/impl/PsiElementBase.java b/source/com/intellij/psi/impl/PsiElementBase.java
index 909c622d7a58..238ce20900f1 100644
--- a/source/com/intellij/psi/impl/PsiElementBase.java
+++ b/source/com/intellij/psi/impl/PsiElementBase.java
@@ -125,7 +125,8 @@ public abstract class PsiElementBase extends ElementBase implements PsiElement,N
   }
 
   public Project getProject() {
-    return getManager().getProject();
+    final PsiManager manager = getManager();
+    return manager != null ? manager.getProject() : null;
   }
 
   public Language getLanguage() {
diff --git a/source/com/intellij/psi/impl/source/tree/CompositePsiElement.java b/source/com/intellij/psi/impl/source/tree/CompositePsiElement.java
index 901a920fec20..f3acfd26d896 100644
--- a/source/com/intellij/psi/impl/source/tree/CompositePsiElement.java
+++ b/source/com/intellij/psi/impl/source/tree/CompositePsiElement.java
@@ -237,7 +237,8 @@ public abstract class CompositePsiElement extends CompositeElement implements Ps
   }
 
   public Project getProject() {
-    return getManager().getProject();
+    final PsiManager manager = getManager();
+    return manager != null ? manager.getProject() : null;
   }
 
   public Language getLanguage() {
diff --git a/source/com/intellij/psi/impl/source/tree/LeafPsiElement.java b/source/com/intellij/psi/impl/source/tree/LeafPsiElement.java
index 6673420f995f..de83f526f122 100644
--- a/source/com/intellij/psi/impl/source/tree/LeafPsiElement.java
+++ b/source/com/intellij/psi/impl/source/tree/LeafPsiElement.java
@@ -184,7 +184,8 @@ public class LeafPsiElement extends LeafElementImpl implements PsiElement {
   }
 
   public Project getProject() {
-    return getManager().getProject();
+    final PsiManager manager = getManager();
+    return manager != null ? manager.getProject() : null;
   }
 
   public Language getLanguage() {