Service better behaved for failed restarts