Final improvement to prompt exit handling