target: remove more exit() calls