diff --git a/method.py b/method.py
index bb488fb..384e107 100644
--- a/method.py
+++ b/method.py
@@ -1341,7 +1341,7 @@ class CloseTag(Method):
                 return
             i += 1
         if i >= len(tokens[y]):
-            app.set_error('none found: %d' % (i))
+            #app.set_error('none found: %d' % (i))
             return
 
         tag_stack = []
@@ -1365,7 +1365,7 @@ class CloseTag(Method):
                 i -= 1
             y -= 1
             i = len(tokens[y]) - 1
-        app.set_error('tag mismatch: no tag found')
+        #app.set_error('tag mismatch: no tag found')
 
 class CloseParen(CloseTag):
     mytag = ')'
diff --git a/mode_perl.py b/mode_perl.py
index 2ec8cfb..4de2aa3 100644
--- a/mode_perl.py
+++ b/mode_perl.py
@@ -125,10 +125,20 @@ class PerlTabber(tab2.StackTabber):
         fqname = token.fqname()
         if fqname == 'delimiter' and token.string == ';':
             self._opt_pop('cont')
-        elif fqname == 'heredoc.start':
-            self._opt_append('heredoc', None)
-        elif fqname == 'heredoc.end':
-            self._opt_pop('heredoc')
+        elif fqname == 'heredoc1.start':
+            self._opt_append('heredoc1', None)
+        elif fqname == 'heredoc1.end':
+            self._opt_pop('heredoc1')
+            self._opt_pop('cont')
+        elif fqname == 'heredoc2.start':
+            self._opt_append('heredoc2', None)
+        elif fqname == 'heredoc2.end':
+            self._opt_pop('heredoc2')
+            self._opt_pop('cont')
+        elif fqname == 'eval_heredoc.start':
+            self._opt_append('eval_heredoc', None)
+        elif fqname == 'eval_heredoc.end':
+            self._opt_pop('eval_heredoc')
             self._opt_pop('cont')
         elif fqname == 'pod.start':
             self._opt_append('pod', None)