Manage restarting the service better.