Comment 20 for bug 1990196

I just spotted the associated code change above. Will add this to the solution and test.

The catch code in comment #19 prevents the crash when next or continue buttons are pressed, but they are still present.