Added proper fixed quiz exit handling