Merge pull request #920 from ironmansoftware/919

Fixes #919
ironmansoftware · Jun 29, 2019 · c73477b · c73477b
2 parents 58e2898 + fc22f6a
commit c73477b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/UniversalDashboard/Cmdlets/StartDashboardCommand.cs b/src/UniversalDashboard/Cmdlets/StartDashboardCommand.cs
@@ -65,8 +65,10 @@ protected override void EndProcessing()
 
 			if (Force) {
 				var existingServer = Server.Servers.FirstOrDefault(m => m.Port == Port || m.Name == m.Name);
-				existingServer.Stop();
-				Server.Servers.Remove(existingServer);
+				if (existingServer != null) {
+					existingServer.Stop();
+					Server.Servers.Remove(existingServer);
+				}
 			}
 
             // Cache dashboard

diff --git a/src/UniversalDashboard/Cmdlets/StartRestApiCommand.cs b/src/UniversalDashboard/Cmdlets/StartRestApiCommand.cs
@@ -58,8 +58,10 @@ protected override void EndProcessing()
 
 			if (Force) {
 				var existingServer = Server.Servers.FirstOrDefault(m => m.Port == Port || m.Name == m.Name);
-				existingServer.Stop();
-				Server.Servers.Remove(existingServer);
+				if (existingServer != null) {
+					existingServer.Stop();
+					Server.Servers.Remove(existingServer);
+				}
 			}
 
 			var server = new Server(Name, MyInvocation.ScriptName, AutoReload, Host, Port);