diff --git a/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java b/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java
index ebb7e2b85dd0..f31778d64f97 100644
--- a/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java
+++ b/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java
@@ -159,7 +159,7 @@ public abstract class PsiDocumentManager {
      * @param psiFile the file for which the document was created.
      * @see PsiDocumentManager#getDocument(PsiFile)
      */
-    void documentCreated(Document document, PsiFile psiFile);
+    void documentCreated(@NotNull Document document, PsiFile psiFile);
 
     /**
      * Called when a file instance is created for a document.
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java
index 7c5eb97d4b2a..84e455f565d3 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java
@@ -556,7 +556,7 @@ public class PsiDocumentManagerImpl extends PsiDocumentManager implements Projec
     if(viewProvider != null) component.doPostponedFormatting(viewProvider);
   }
 
-  private void fireDocumentCreated(Document document, PsiFile file) {
+  private void fireDocumentCreated(@NotNull Document document, PsiFile file) {
     for (Listener listener : myListeners) {
       listener.documentCreated(document, file);
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/DocumentMarkupModel.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/DocumentMarkupModel.java
index d5d4c872ac0a..4cb810f39fae 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/DocumentMarkupModel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/DocumentMarkupModel.java
@@ -53,7 +53,7 @@ public class DocumentMarkupModel {
    * @return the markup model instance.
    * @see com.intellij.openapi.editor.Editor#getMarkupModel()
    */
-  public static MarkupModel forDocument(Document document, @Nullable Project project, boolean create) {
+  public static MarkupModel forDocument(@NotNull Document document, @Nullable Project project, boolean create) {
     if (document instanceof DocumentWindow) {
       final Document delegate = ((DocumentWindow)document).getDelegate();
       final MarkupModelEx baseMarkupModel = (MarkupModelEx)forDocument(delegate, project, true);
@@ -97,7 +97,7 @@ public class DocumentMarkupModel {
     return model;
   }
 
-  private static ConcurrentMap<Project, MarkupModelImpl> getMarkupModelMap(Document document) {
+  private static ConcurrentMap<Project, MarkupModelImpl> getMarkupModelMap(@NotNull Document document) {
     ConcurrentMap<Project, MarkupModelImpl> markupModelMap = document.getUserData(MARKUP_MODEL_MAP_KEY);
     if (markupModelMap == null) {
       synchronized (lock) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingProjectManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingProjectManagerImpl.java
index a7305c798d02..5e6b834c77ed 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingProjectManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingProjectManagerImpl.java
@@ -72,10 +72,8 @@ public class EncodingProjectManagerImpl extends EncodingProjectManager {
     myEditorSettings = editorSettings;
     documentManager.addListener(new PsiDocumentManager.Listener() {
       @Override
-      public void documentCreated(Document document, PsiFile psiFile) {
-        if (document != null) {
-          ((EncodingManagerImpl)EncodingManager.getInstance()).queueUpdateEncodingFromContent(document);
-        }
+      public void documentCreated(@NotNull Document document, PsiFile psiFile) {
+        ((EncodingManagerImpl)EncodingManager.getInstance()).queueUpdateEncodingFromContent(document);
       }
 
       @Override