Don't stop permanently on exit (fixes #637)