diff --git a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
index 800524b3..693add32 100644
--- a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
+++ b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
@@ -874,8 +874,11 @@ namespace SafeExamBrowser.Client.UnitTests
 		[TestMethod]
 		public void Shutdown_MustNotFailIfDependenciesAreNull()
 		{
+			context.AppConfig = null;
 			context.Browser = null;
 			context.ClientHost = null;
+			context.Server = null;
+			context.Settings = null;
 
 			sut.Terminate();
 		}
diff --git a/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj b/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj
index 46a6bb67..97b8acd6 100644
--- a/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj
+++ b/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj
@@ -156,6 +156,10 @@
       <Project>{6d563a30-366d-4c35-815b-2c9e6872278b}</Project>
       <Name>SafeExamBrowser.Monitoring.Contracts</Name>
     </ProjectReference>
+    <ProjectReference Include="..\SafeExamBrowser.Server.Contracts\SafeExamBrowser.Server.Contracts.csproj">
+      <Project>{db701e6f-bddc-4cec-b662-335a9dc11809}</Project>
+      <Name>SafeExamBrowser.Server.Contracts</Name>
+    </ProjectReference>
     <ProjectReference Include="..\SafeExamBrowser.Settings\SafeExamBrowser.Settings.csproj">
       <Project>{30b2d907-5861-4f39-abad-c4abf1b3470e}</Project>
       <Name>SafeExamBrowser.Settings</Name>
diff --git a/SafeExamBrowser.Client/ClientController.cs b/SafeExamBrowser.Client/ClientController.cs
index 11f5c5bc..7235d08f 100644
--- a/SafeExamBrowser.Client/ClientController.cs
+++ b/SafeExamBrowser.Client/ClientController.cs
@@ -251,12 +251,12 @@ namespace SafeExamBrowser.Client
 
 		private void CloseShell()
 		{
-			if (Settings.ActionCenter.EnableActionCenter)
+			if (Settings?.ActionCenter.EnableActionCenter == true)
 			{
 				actionCenter.Close();
 			}
 
-			if (Settings.Taskbar.EnableTaskbar)
+			if (Settings?.Taskbar.EnableTaskbar == true)
 			{
 				taskbar.Close();
 			}