diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index ed59f05b1ec..23e0b939334 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -21,6 +21,7 @@
 import sys
 import tempfile
 import textwrap
+import traceback
 
 # TODO:
 #
@@ -1082,7 +1083,11 @@ def parse(self, input):
                     assert dsl_name in parsers, "No parser to handle {!r} block.".format(dsl_name)
                     self.parsers[dsl_name] = parsers[dsl_name](self)
                 parser = self.parsers[dsl_name]
-                parser.parse(block)
+                try:
+                    parser.parse(block)
+                except Exception:
+                    fail('Exception raised during parsing:\n' +
+                         traceback.format_exc().rstrip())
             printer.print_block(block)
         return printer.f.getvalue()