diff --git a/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionInitializationContext.java b/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionInitializationContext.java
index 8ba67b58cc81..ba1e24496a47 100644
--- a/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionInitializationContext.java
+++ b/platform/analysis-api/src/com/intellij/codeInsight/completion/CompletionInitializationContext.java
@@ -6,6 +6,7 @@ import com.intellij.openapi.editor.Caret;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
+import com.intellij.util.ObjectUtils;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -34,7 +35,7 @@ public class CompletionInitializationContext {
 
   public CompletionInitializationContext(final Editor editor,
                                          final @NotNull Caret caret,
-                                         @NotNull Language language,
+                                         Language language,
                                          final PsiFile file,
                                          final CompletionType completionType,
                                          int invocationCount) {
@@ -74,7 +75,7 @@ public class CompletionInitializationContext {
 
   @NotNull
   public Language getPositionLanguage() {
-    return myPositionLanguage;
+    return ObjectUtils.assertNotNull(myPositionLanguage);
   }
 
   public String getDummyIdentifier() {
diff --git a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java
index 2d74da770e04..dc9c8d574bdf 100644
--- a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java
+++ b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java
@@ -44,17 +44,19 @@ public class PsiUtilBase extends PsiUtilCore implements PsiEditorUtil {
     return host != null && isUnderPsiRoot(root, host);
   }
 
-  @NotNull
+  @Nullable
   public static Language getLanguageInEditor(@NotNull final Editor editor, @NotNull final Project project) {
     return getLanguageInEditor(editor.getCaretModel().getCurrentCaret(), project);
   }
 
-  @NotNull
+  @Nullable
   public static Language getLanguageInEditor(@NotNull Caret caret, @NotNull final Project project) {
     Editor editor = caret.getEditor();
     PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());
 
-    assert file != null;
+    if (file == null) {
+      return null;
+    }
 
     int caretOffset = caret.getOffset();
     int mostProbablyCorrectLanguageOffset = caretOffset == caret.getSelectionEnd() ? caret.getSelectionStart() : caretOffset;