diff --git a/plugin/packages/wakatime/HISTORY.rst b/plugin/packages/wakatime/HISTORY.rst
index 1eeb638..612f290 100644
--- a/plugin/packages/wakatime/HISTORY.rst
+++ b/plugin/packages/wakatime/HISTORY.rst
@@ -3,6 +3,12 @@ History
 -------
 
 
+3.0.5 (2015-01-13)
+++++++++++++++++++
+
+- ignore errors from malformed markup (too many closing tags)
+
+
 3.0.4 (2015-01-06)
 ++++++++++++++++++
 
diff --git a/plugin/packages/wakatime/wakatime/__init__.py b/plugin/packages/wakatime/wakatime/__init__.py
index df7257a..13397f1 100644
--- a/plugin/packages/wakatime/wakatime/__init__.py
+++ b/plugin/packages/wakatime/wakatime/__init__.py
@@ -13,7 +13,7 @@
 from __future__ import print_function
 
 __title__ = 'wakatime'
-__version__ = '3.0.4'
+__version__ = '3.0.5'
 __author__ = 'Alan Hamlett'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2014 Alan Hamlett'
diff --git a/plugin/packages/wakatime/wakatime/languages/templates.py b/plugin/packages/wakatime/wakatime/languages/templates.py
index 200e418..69e5267 100644
--- a/plugin/packages/wakatime/wakatime/languages/templates.py
+++ b/plugin/packages/wakatime/wakatime/languages/templates.py
@@ -120,7 +120,11 @@ class HtmlDjangoParser(TokenParser):
 
     def _process_tag(self, token, content):
         if content.startswith('</') or content.startswith('/'):
-            self.tags.pop(0)
+            try:
+                self.tags.pop(0)
+            except IndexError:
+                # ignore errors from malformed markup
+                pass
             self.getting_attrs = False
         elif content.startswith('<'):
             self.tags.insert(0, content.replace('<', '', 1).strip().lower())