diff --git a/platform/lang-api/src/com/intellij/codeInsight/template/TemplateBuilder.java b/platform/lang-api/src/com/intellij/codeInsight/template/TemplateBuilder.java
index a9e27d9a28b1..a6b955f6b850 100644
--- a/platform/lang-api/src/com/intellij/codeInsight/template/TemplateBuilder.java
+++ b/platform/lang-api/src/com/intellij/codeInsight/template/TemplateBuilder.java
@@ -18,6 +18,7 @@ package com.intellij.codeInsight.template;
 
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Shows a live template-like chooser UI over a PSI element and offers the user to replace certain sub-elements of the
@@ -34,9 +35,9 @@ public interface TemplateBuilder {
    * @param element the element to replace.
    * @param replacementText the initial value for the replacement.
    */
-  void replaceElement(PsiElement element, String replacementText);
+  void replaceElement(@NotNull PsiElement element, String replacementText);
 
-  void replaceElement(PsiElement element, TextRange rangeWithinElement, String replacementText);
+  void replaceElement(@NotNull PsiElement element, TextRange rangeWithinElement, String replacementText);
 
   /**
    * Creates a replacement box for the specified element with the specified expression.
@@ -44,9 +45,9 @@ public interface TemplateBuilder {
    * @param element the element to replace.
    * @param expression the replacement expression.
    */
-  void replaceElement(PsiElement element, Expression expression);
+  void replaceElement(@NotNull PsiElement element, Expression expression);
 
-  void replaceElement(PsiElement element, TextRange rangeWithinElement, Expression expression);
+  void replaceElement(@NotNull PsiElement element, TextRange rangeWithinElement, Expression expression);
 
   /**
    * Creates a replacement box for the specified text range within the container element.
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateBuilderImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateBuilderImpl.java
index 4e41928a7ba2..4855d980d53d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateBuilderImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/TemplateBuilderImpl.java
@@ -119,13 +119,13 @@ public class TemplateBuilderImpl implements TemplateBuilder {
     myElements.add(key);
   }
 
-  public void replaceElement(PsiElement element, Expression expression) {
+  public void replaceElement(@NotNull PsiElement element, Expression expression) {
     final RangeMarker key = wrapElement(element);
     replaceElement(key, expression);
   }
 
   @Override
-  public void replaceElement(PsiElement element, TextRange rangeWithinElement, Expression expression) {
+  public void replaceElement(@NotNull PsiElement element, TextRange rangeWithinElement, Expression expression) {
     final RangeMarker key = myDocument.createRangeMarker(rangeWithinElement.shiftRight(element.getTextRange().getStartOffset()));
     replaceElement(key, expression);
   }
@@ -242,11 +242,11 @@ public class TemplateBuilderImpl implements TemplateBuilder {
     return myDocument.getCharsSequence().subSequence(startOffset, endOffset).toString();
   }
 
-  public void replaceElement(PsiElement element, String replacementText) {
+  public void replaceElement(@NotNull PsiElement element, String replacementText) {
     replaceElement(element, new ConstantNode(replacementText));
   }
 
-  public void replaceElement(PsiElement element, TextRange rangeWithinElement, String replacementText) {
+  public void replaceElement(@NotNull PsiElement element, TextRange rangeWithinElement, String replacementText) {
     final RangeMarker key = myDocument.createRangeMarker(rangeWithinElement.shiftRight(element.getTextRange().getStartOffset()));
     ConstantNode value = new ConstantNode(replacementText);
     replaceElement(key, value);