diff --git a/HomeGenie/Program.cs b/HomeGenie/Program.cs
index 261b01be..bc3b06bb 100644
--- a/HomeGenie/Program.cs
+++ b/HomeGenie/Program.cs
@@ -61,8 +61,15 @@ private static void ShutDown(bool restart, bool saveData = true)
 
             if (Homegenie != null)
             {
-                Homegenie.Stop(saveData);
-                Homegenie = null;
+                try
+                {
+                    Homegenie.Stop(saveData);
+                    Homegenie = null;
+                }
+                catch (Exception e)
+                {
+                    Log.Error(e);
+                }
             }
 
             if (restart)