Corrections to exit handler... handling.