improve sender exiting