diff --git a/MareSynchronos/FileCache/TransientResourceManager.cs b/MareSynchronos/FileCache/TransientResourceManager.cs
index f050c50..52d88a9 100644
--- a/MareSynchronos/FileCache/TransientResourceManager.cs
+++ b/MareSynchronos/FileCache/TransientResourceManager.cs
@@ -173,7 +173,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
         }
 
         bool reloadSemiTransient = false;
-        if (SemiTransientResources.TryGetValue(objectKind, out var semiset))
+        if (objectKind == ObjectKind.Player && SemiTransientResources.TryGetValue(objectKind, out var semiset))
         {
             foreach (var file in semiset.Where(p => list.Contains(p, StringComparer.OrdinalIgnoreCase)))
             {
diff --git a/MareSynchronos/Services/DalamudUtilService.cs b/MareSynchronos/Services/DalamudUtilService.cs
index 4e292c6..e906b8b 100644
--- a/MareSynchronos/Services/DalamudUtilService.cs
+++ b/MareSynchronos/Services/DalamudUtilService.cs
@@ -295,7 +295,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public uint GetHomeWorldId()
     {
         EnsureIsOnFramework();
-        return _clientState.LocalPlayer!.HomeWorld.RowId;
+        return _clientState.LocalPlayer?.HomeWorld.RowId ?? 0;
     }
 
     public uint GetWorldId()