diff --git a/NzbDrone.Update/Providers/UpdateProvider.cs b/NzbDrone.Update/Providers/UpdateProvider.cs
index 2837130c3..94e9cb71a 100644
--- a/NzbDrone.Update/Providers/UpdateProvider.cs
+++ b/NzbDrone.Update/Providers/UpdateProvider.cs
@@ -54,9 +54,17 @@ namespace NzbDrone.Update.Providers
                && _serviceProvider.IsServiceRunning(ServiceProvider.NZBDRONE_SERVICE_NAME))
             {
                 appType = AppType.Service;
-                _serviceProvider.Stop(ServiceProvider.NZBDRONE_SERVICE_NAME);
-            }
 
+                try
+                {
+                    _serviceProvider.Stop(ServiceProvider.NZBDRONE_SERVICE_NAME);
+
+                }
+                catch (InvalidOperationException e)
+                {
+                    logger.WarnException("couldn't stop service", e);
+                }
+            }
             else
             {
                 appType = AppType.Normal;
diff --git a/NzbDrone/Owin/OwinHostController.cs b/NzbDrone/Owin/OwinHostController.cs
index 2d4c56037..8a5da9ec4 100644
--- a/NzbDrone/Owin/OwinHostController.cs
+++ b/NzbDrone/Owin/OwinHostController.cs
@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using Microsoft.Owin.Hosting;
 using NLog;
-using Nancy.Bootstrapper;
-using Nancy.Owin;
 using NzbDrone.Common;
 using NzbDrone.Owin.MiddleWare;
 using Owin;