diff --git a/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java b/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
index af7d0f557c8c..9aac4bf4323d 100644
--- a/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
+++ b/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
@@ -952,7 +952,7 @@ public class PsiTreeUtil {
     throw new AssertionError(descendant + " is not a descendant of " + ancestor);
   }
 
-  public static List<PsiElement> getInjectedElements(OuterLanguageElement outerLanguageElement) {
+  public static List<PsiElement> getInjectedElements(@NotNull OuterLanguageElement outerLanguageElement) {
     PsiElement psi = outerLanguageElement.getContainingFile().getViewProvider().getPsi(outerLanguageElement.getLanguage());
     TextRange injectionRange = outerLanguageElement.getTextRange();
     List<PsiElement> res = Lists.newArrayList();
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java
index fdef2f30713e..39ba70a41730 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java
@@ -189,7 +189,11 @@ public class CommentByBlockCommentHandler implements CodeInsightActionHandler {
     return true;
   }
 
-  private boolean isInjectedWhiteSpace(TextRange range, OuterLanguageElement element) {
+  private boolean isInjectedWhiteSpace(@NotNull TextRange range, @NotNull OuterLanguageElement element) {
+    PsiElement psi = element.getContainingFile().getViewProvider().getPsi(element.getLanguage());
+    if (psi == null) {
+      return false;
+    }
     List<PsiElement> injectedElements = PsiTreeUtil.getInjectedElements(element);
     for (PsiElement el : injectedElements) {
       if (!isWhiteSpaceOrComment(el, range)) {