diff --git a/autosiso.py b/autosiso.py
index 46b13697ad..07d9bfbb1f 100755
--- a/autosiso.py
+++ b/autosiso.py
@@ -62,11 +62,12 @@ def main(argv):
             '-project=',
             '-reapi_instance=',
         ] + argv[1:]
-        return siso.main(argv)
+        try:
+            return siso.main(argv)
+        except KeyboardInterrupt:
+            print("Shutting down reproxy...", file=sys.stderr)
+            return 1
 
 
 if __name__ == '__main__':
-    try:
-        sys.exit(main(sys.argv))
-    except KeyboardInterrupt:
-        sys.exit(1)
+    sys.exit(main(sys.argv))
diff --git a/ninja_reclient.py b/ninja_reclient.py
index 451ae9967b..b911a964ec 100755
--- a/ninja_reclient.py
+++ b/ninja_reclient.py
@@ -22,6 +22,7 @@ def main(argv):
         try:
             return ninja.main(argv)
         except KeyboardInterrupt:
+            print("Shutting down reproxy...", file=sys.stderr)
             return 1
 
 
diff --git a/reclient_helper.py b/reclient_helper.py
index a7e5d0cd39..0aacd27d62 100644
--- a/reclient_helper.py
+++ b/reclient_helper.py
@@ -274,7 +274,6 @@ def build_context(argv, tool):
     try:
         yield
     finally:
-        print("Shutting down reproxy...", file=sys.stderr)
         start = time.time()
         stop_reproxy(reclient_cfg, reclient_bin_dir)
         if os.environ.get('NINJA_SUMMARIZE_BUILD') == '1':