From 4cf4b1604b59d8c0782d37c99e4e9e4b82608ad3 Mon Sep 17 00:00:00 2001
From: MapleWheels <njainanan@hotmail.com>
Date: Tue, 3 Feb 2026 18:55:30 -0500
Subject: [PATCH] Fixed some NREs.

---
 .../SharedSource/LuaCs/Services/PluginManagementService.cs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/PluginManagementService.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/PluginManagementService.cs
index 9ab837140..b6144435c 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/PluginManagementService.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/PluginManagementService.cs
@@ -124,7 +124,7 @@ public class PluginManagementService : IAssemblyManagementService
             }
         }
         _pluginInstances.Clear();
-        _pluginInjectorContainer.Dispose();
+        _pluginInjectorContainer?.Dispose();
         _pluginInjectorContainer = null;
         
         foreach (var loader in _assemblyLoaders)
@@ -136,12 +136,12 @@ public class PluginManagementService : IAssemblyManagementService
             }
             catch (Exception e)
             {
-                _logger.LogError($"Failed to dispose of {nameof(IAssemblyLoaderService)} for ContentPackage {loader.Key.Name}: \n{e.Message}");
+                _logger?.LogError($"Failed to dispose of {nameof(IAssemblyLoaderService)} for ContentPackage {loader.Key.Name}: \n{e.Message}");
                 if (loader.Value.Assemblies.Any())
                 {
                     foreach (var ass in loader.Value.Assemblies)
                     {
-                        _logger.LogWarning($"{nameof(PluginManagementService)}: Fallback manual unsubscription of assemblies: {ass.GetName()}");
+                        _logger?.LogWarning($"{nameof(PluginManagementService)}: Fallback manual unsubscription of assemblies: {ass.GetName()}");
                         ReflectionUtils.RemoveAssemblyFromCache(ass);
                     }
                 }