Only one fatal restart, then notify with failure

Additionally, slight refactor of restarting code