diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
index fa35cb2c005f..a9291d29f85f 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
@@ -803,6 +803,7 @@ public class TemplateState implements Disposable {
   }
 
   public void gotoEnd(boolean brokenOff) {
+    if (myTemplate == null) return;
     calcResults(false);
     doReformat(null);
     finishTemplateEditing(brokenOff);
@@ -815,6 +816,7 @@ public class TemplateState implements Disposable {
   private void finishTemplateEditing(boolean brokenOff) {
     if (myTemplate == null) return;
 
+
     LookupManager.getInstance(myProject).hideActiveLookup();
 
     int endSegmentNumber = myTemplate.getEndSegmentNumber();