clean up better after errors, disable auto-restart