diff --git a/Wino.Core.UWP/Services/NotificationBuilder.cs b/Wino.Core.UWP/Services/NotificationBuilder.cs
index 6b10c604..37e8d7e7 100644
--- a/Wino.Core.UWP/Services/NotificationBuilder.cs
+++ b/Wino.Core.UWP/Services/NotificationBuilder.cs
@@ -185,7 +185,7 @@ namespace Wino.Core.UWP.Services
                 else
                     badgeUpdater.Clear();
             }
-            catch (System.Exception ex)
+            catch (Exception)
             {
                 // TODO: Log exceptions.
 
diff --git a/Wino.Core.UWP/Services/WinoServerConnectionManager.cs b/Wino.Core.UWP/Services/WinoServerConnectionManager.cs
index 2d382d2c..bb43e249 100644
--- a/Wino.Core.UWP/Services/WinoServerConnectionManager.cs
+++ b/Wino.Core.UWP/Services/WinoServerConnectionManager.cs
@@ -89,6 +89,8 @@ namespace Wino.Core.UWP.Services
         {
             if (Connection == null || Status == WinoServerConnectionStatus.Disconnected) return true;
 
+            await Task.CompletedTask;
+
             // TODO: Send disconnect message to the fulltrust process.
 
             return true;