diff --git a/frontends/etiquette_flask/etiquette_flask_launch.py b/frontends/etiquette_flask/etiquette_flask_launch.py
index 42c7286..fd139f3 100644
--- a/frontends/etiquette_flask/etiquette_flask_launch.py
+++ b/frontends/etiquette_flask/etiquette_flask_launch.py
@@ -63,7 +63,7 @@ def main(argv):
     parser.set_defaults(func=run_argparse)
 
     args = parser.parse_args(argv)
-    args.func(args)
+    return args.func(args)
 
 if __name__ == '__main__':
     raise SystemExit(main(sys.argv[1:]))
diff --git a/frontends/etiquette_repl/etiquette_repl_launch.py b/frontends/etiquette_repl/etiquette_repl_launch.py
index 4335f71..64bad34 100644
--- a/frontends/etiquette_repl/etiquette_repl_launch.py
+++ b/frontends/etiquette_repl/etiquette_repl_launch.py
@@ -47,7 +47,7 @@ def main(argv):
     parser.set_defaults(func=erepl_argparse)
 
     args = parser.parse_args(argv)
-    args.func(args)
+    return args.func(args)
 
 if __name__ == '__main__':
-    main(sys.argv[1:])
+    raise SystemExit(main(sys.argv[1:]))
diff --git a/utilities/database_upgrader/database_upgrader.py b/utilities/database_upgrader/database_upgrader.py
index c8d3331..ff335ab 100644
--- a/utilities/database_upgrader/database_upgrader.py
+++ b/utilities/database_upgrader/database_upgrader.py
@@ -303,7 +303,7 @@ def main(argv):
     parser.set_defaults(func=upgrade_all_argparse)
 
     args = parser.parse_args(argv)
-    args.func(args)
+    return args.func(args)
 
 if __name__ == '__main__':
-    main(sys.argv[1:])
+    raise SystemExit(main(sys.argv[1:]))