Handle the case where we are force-stopped while restarting
Merge pull request #246 from daboross/patch-fix-restarting-killing

Handle the case where we are force-stopped while restarting