Bug 856999: fix for using --no-quit and --stop-on-error together, which was quiting before