diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/FilterToken.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/FilterToken.java
index 4a79f392a302..82c3f8f24e21 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/FilterToken.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/FilterToken.java
@@ -28,4 +28,9 @@ public class FilterToken extends Token {
   public String getSuffix() {
     return mySuffix;
   }
+
+  @Override
+  public String toString() {
+    return "|" + mySuffix;
+  }
 }
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/MarkerToken.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/MarkerToken.java
index ba9c9af1b9c8..54f54f810c59 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/MarkerToken.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/MarkerToken.java
@@ -19,4 +19,8 @@ package com.intellij.codeInsight.template.zencoding;
  * @author Eugene.Kudelevsky
  */
 class MarkerToken extends Token {
+  @Override
+  public String toString() {
+    return "&";
+  }
 }
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/NumberToken.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/NumberToken.java
index d101c8f4325f..ffea97d94ac6 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/NumberToken.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/NumberToken.java
@@ -28,4 +28,9 @@ class NumberToken extends Token {
   public int getNumber() {
     return myNumber;
   }
+
+  @Override
+  public String toString() {
+    return Integer.toString(myNumber);
+  }
 }
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/OperationToken.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/OperationToken.java
index b33e164eee8e..1cd3acbd566b 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/OperationToken.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/OperationToken.java
@@ -28,4 +28,9 @@ class OperationToken extends Token {
   public char getSign() {
     return mySign;
   }
+
+  @Override
+  public String toString() {
+    return Character.toString(mySign);
+  }
 }
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/TemplateToken.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/TemplateToken.java
index 1a0f490fbe64..3257ccc9d49c 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/TemplateToken.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/TemplateToken.java
@@ -39,4 +39,9 @@ public class TemplateToken extends Token {
   public TemplateImpl getTemplate() {
     return myTemplate;
   }
+
+  @Override
+  public String toString() {
+    return "TEMPLATE";
+  }
 }
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingInterpreter.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingInterpreter.java
index 5ad53eec3a94..01ffb0dda8a2 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingInterpreter.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingInterpreter.java
@@ -372,7 +372,7 @@ class XmlZenCodingInterpreter {
     return new XmlZenCodingFilterImpl().toString(tag, context);
   }
 
-  private static void fail() {
-    LOG.error("Input string was checked incorrectly during isApplicable() invokation");
+  private void fail() {
+    LOG.error("Input string was checked incorrectly during isApplicable() invokation: " + myTokens.toString());
   }
 }