Stop and restart now works

Should also work when it bombs out due to an error.