Minor fix on abort/exit functionality