diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java
index adc993471f88..505ce73061be 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java
@@ -323,5 +323,25 @@ public abstract class DomAnchorImpl<T extends DomElement> implements DomAnchor<T
     public XmlFile getContainingFile() {
       return (XmlFile)myAnchor.getFile();
     }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+
+      PsiBasedDomAnchor anchor = (PsiBasedDomAnchor)o;
+
+      if (myAnchor != null ? !myAnchor.equals(anchor.myAnchor) : anchor.myAnchor != null) return false;
+      if (myProject != null ? !myProject.equals(anchor.myProject) : anchor.myProject != null) return false;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int result = myAnchor != null ? myAnchor.hashCode() : 0;
+      result = 31 * result + (myProject != null ? myProject.hashCode() : 0);
+      return result;
+    }
   }
 }
diff --git a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java
index dc6fad5d8ad6..2551b446df90 100644
--- a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java
+++ b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java
@@ -90,6 +90,7 @@ public class DomModelImpl<T extends DomElement> {
     return myMergedModel instanceof MergedObject ? ((MergedObject) myMergedModel).getImplementations() : Collections.singletonList(myMergedModel);
   }
 
+  @NotNull
   public Project getProject() {
     return myProject;
   }