diff --git a/Support/content.ejs b/Support/content.ejs
index c1946df..8c4ba43 100644
--- a/Support/content.ejs
+++ b/Support/content.ejs
@@ -67,7 +67,10 @@
                 <% } %>
                 <a href="<%= issue.url %>">at line <%= issue.line %> position <%= issue.character %></a>
                 <div><tt>
-                    <%= issue.reason %> (<a href="http://eslint.org/docs/rules/<%= issue.shortname %>.html" class="open-external"><%= issue.shortname %></a>)
+                    <%= issue.reason %>
+                    <% if (issue.shortname) { %>
+                         (<a href="http://eslint.org/docs/rules/<%= issue.shortname %>.html" class="open-external"><%= issue.shortname %></a>)
+                    <% } %>
                 </tt></div>
             </li>
         <% } %>
diff --git a/Support/validate.py b/Support/validate.py
index b780003..4d45af0 100755
--- a/Support/validate.py
+++ b/Support/validate.py
@@ -294,8 +294,10 @@ def validate(quiet=False):
         sys.exit()
 
     # parse the results
-    rx = re.compile('^[^:]+\: line (?P<line>\d+), col (?P<character>\d+), ' +
-        '(?P<code>\w+) - (?P<reason>.+) \((?P<shortname>\w+)\)$')
+
+    rx = re.compile('^[^:]+\\: line (?P<line>\\d+), ' +
+        'col (?P<character>\\d+), ' +
+        '(?P<code>\\w+) - (?P<reason>.+)\\s?(\\((?P<shortname>\\w+)\\))?$')
 
     issues = []
 
@@ -313,10 +315,12 @@ def validate(quiet=False):
             'line': int(m.group('line')),
             'character': int(m.group('character')) + 1,
             'code': m.group('code'),
-            'reason': m.group('reason'),
-            'shortname': m.group('shortname')
+            'reason': m.group('reason')
         }
 
+        if m.group('shortname'):
+            issue['shortname'] = m.group('shortname')
+
         issues.append(issue)
 
     # normalize line numbers