diff --git a/HoloLensCommander/HoloLensCommander/Controls/DeviceMonitorControlViewModel.cs b/HoloLensCommander/HoloLensCommander/Controls/DeviceMonitorControlViewModel.cs
index 0cde4e48..7731109a 100644
--- a/HoloLensCommander/HoloLensCommander/Controls/DeviceMonitorControlViewModel.cs
+++ b/HoloLensCommander/HoloLensCommander/Controls/DeviceMonitorControlViewModel.cs
@@ -632,7 +632,7 @@ namespace HoloLensCommander
             // Did we recover from a heartbeat loss?
             if (this.StatusMessage == HeartbeatLostMessage)
             {
-                this.StatusMessage = string.Empty;
+                this.ClearStatusMessage();
             }
 
             // Handle whether or not we were previously selected
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/SettingsDialog.xaml.cs b/HoloLensCommander/HoloLensCommander/Dialogs/SettingsDialog.xaml.cs
index e6161261..d82d793d 100644
--- a/HoloLensCommander/HoloLensCommander/Dialogs/SettingsDialog.xaml.cs
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/SettingsDialog.xaml.cs
@@ -36,7 +36,7 @@ namespace HoloLensCommander
                 // Return the data
                 ((SettingsDialogViewModel)this.DataContext).UpdateUserData(this.appSettings);
                 this.appSettings.SettingsUpdated = true;
-                this.appSettings.StatusMessage = "";
+                this.appSettings.StatusMessage = string.Empty;
             }
             catch(Exception e)
             {
diff --git a/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs b/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
index 5e53eeba..67a19c48 100644
--- a/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
+++ b/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
@@ -199,7 +199,7 @@ namespace HoloLensCommander
             this.ClearStatusMessageCommand = new Command(
                 (parameter) =>
                 {
-                    this.StatusMessage = string.Empty;
+                    this.ClearStatusMessage();
                 });
 
             this.CloseAllAppsCommand = new Command(
@@ -433,12 +433,6 @@ namespace HoloLensCommander
                 });
 
             this.UninstallAppCommand = new Command(
-                (parameter) =>
-                {
-                    this.UninstallApp();
-                });
-
-            this.UninstallAllAppsCommand = new Command(
                 (parameter) =>
                 {
                     try
@@ -453,6 +447,21 @@ namespace HoloLensCommander
                     }
                 });
 
+            this.UninstallAllAppsCommand = new Command(
+                (parameter) =>
+                {
+                    try
+                    {
+                        this.UninstallAllApps();
+                    }
+                    catch (Exception e)
+                    {
+                        this.StatusMessage = string.Format(
+                            "Failed to uninstall all apps on one or more devices ({0})",
+                            e.Message);
+                    }
+                });
+
             this.UseAllDevicesFilterCommand = new Command(
                 (parameter) =>
                 {
diff --git a/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs b/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
index bfb8a842..1cdbf170 100644
--- a/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
+++ b/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
@@ -60,6 +60,14 @@ namespace HoloLensCommander
         public ICommand ClearStatusMessageCommand
         { get; private set; }
 
+        /// <summary>
+        /// Implementation of the clear status message command.
+        /// </summary>
+        private void ClearStatusMessage()
+        {
+            this.StatusMessage = string.Empty;
+        }
+        
         /// <summary>
         /// Command used to close all applications on the selected devices.
         /// </summary>
@@ -471,7 +479,7 @@ namespace HoloLensCommander
         /// </summary>
         private async Task SaveSessionFile()
         {
-            this.StatusMessage = "";
+            this.ClearStatusMessage();
 
             try
             {
diff --git a/HoloLensCommander/HoloLensCommander/Utilities/Settings.cs b/HoloLensCommander/HoloLensCommander/Utilities/Settings.cs
index 2157490f..2370dd0d 100644
--- a/HoloLensCommander/HoloLensCommander/Utilities/Settings.cs
+++ b/HoloLensCommander/HoloLensCommander/Utilities/Settings.cs
@@ -102,13 +102,13 @@ namespace HoloLensCommander
         /// <param name="interval">Seconds between heartbeat checks.</param>
         public Settings(float interval) :  
             this(
-            false, 
+            false,          // autoReconnect
             interval,
-            false,
-            false,
-            false,
-            string.Empty,
-            string.Empty)
+            false,          // expandCredentials
+            false,          // expandNetworkSettigns
+            false,          // useInstalledCertificate
+            string.Empty,   // defaultSsid
+            string.Empty)   // defaultNetworkKey
         { }
 
         /// <summary>