Merge branch 'master' of bitbucket.org:zzzeek/mako into w_json_metadata
diff --git a/scripts/mako-render b/scripts/mako-render
index 122589f..2b951ab 100755
--- a/scripts/mako-render
+++ b/scripts/mako-render
@@ -48,7 +48,13 @@
 
     kw = dict([varsplit(var) for var in opts.var])
     data = fo.read()
-    print(render(data, kw, lookup_dirs=lookup_dirs))
+
+    try:
+        print(render(data, kw, lookup_dirs=lookup_dirs))
+    except:
+        from mako import exceptions
+        print(exceptions.text_error_template().render(), file=sys.stderr)
+        sys.exit(1)
 
 if __name__ == "__main__":
     main()