diff --git a/src/Tgstation.Server.Host.Watchdog/Watchdog.cs b/src/Tgstation.Server.Host.Watchdog/Watchdog.cs
index 8038984135..c6292a3641 100644
--- a/src/Tgstation.Server.Host.Watchdog/Watchdog.cs
+++ b/src/Tgstation.Server.Host.Watchdog/Watchdog.cs
@@ -69,13 +69,13 @@ namespace Tgstation.Server.Host.Watchdog
 				}
 				logger.LogInformation("Detected dotnet executable at {0}", dotnetPath);
 
-			var rootLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+				var rootLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
-			var assemblyStoragePath = Path.Combine(rootLocation, "lib");    //always always next to watchdog
+				var assemblyStoragePath = Path.Combine(rootLocation, "lib");    //always always next to watchdog
 #if DEBUG
-			Directory.CreateDirectory(assemblyStoragePath);
+				Directory.CreateDirectory(assemblyStoragePath);
 #endif
-			var defaultAssemblyPath = Path.GetFullPath(Path.Combine(assemblyStoragePath, "Default"));
+				var defaultAssemblyPath = Path.GetFullPath(Path.Combine(assemblyStoragePath, "Default"));
 #if DEBUG
 				//just copy the shit where it belongs
 				Directory.Delete(assemblyStoragePath, true);
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
index b97eafd733..229468eec2 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
@@ -663,7 +663,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
 						throw new InvalidOperationException("Entered LaunchNoLock with one or more of the servers not being null!");
 
 					var reattachInfo = await reattachInfoTask.ConfigureAwait(false);
-					var doesntNeedNewDmb = doReattach && reattachInfo.Alpha != null && reattachInfo.Bravo != null;
+					var doesntNeedNewDmb = doReattach && reattachInfo?.Alpha != null && reattachInfo?.Bravo != null;
 					var dmbToUse = doesntNeedNewDmb ? null : dmbFactory.LockNextDmb(2);
 
 					try