diff --git a/tools/compile-handlebars-templates b/tools/compile-handlebars-templates
index 64e7debf57..41a46ae2e3 100755
--- a/tools/compile-handlebars-templates
+++ b/tools/compile-handlebars-templates
@@ -47,5 +47,9 @@ def run_forever():
 
 if __name__ == '__main__':
     if len(sys.argv) == 2 and sys.argv[1] == 'forever':
-        run_forever()
-    run()
+        try:
+            run_forever()
+        except KeyboardInterrupt:
+            print(sys.argv[0], "exited after receiving KeyboardInterrupt")
+    else:
+        run()