Revert to using exit instead of returning from run.  Catch SystemExit if you don't want to exit