diff --git a/CodeWalker.Core/World/Scenarios.cs b/CodeWalker.Core/World/Scenarios.cs
index f25b475..d598b49 100644
--- a/CodeWalker.Core/World/Scenarios.cs
+++ b/CodeWalker.Core/World/Scenarios.cs
@@ -1682,7 +1682,16 @@ namespace CodeWalker.World
             {
                 if (PedModelSets == null) return null;
                 AmbientModelSet ms;
-                PedModelSets.TryGetValue(hash, out ms);
+                if(!PedModelSets.TryGetValue(hash, out ms))
+                {
+                    string s_hash = hash.ToString("X");
+                    ms = new AmbientModelSet();
+                    ms.Name = $"UNKNOWN PED MODELSET ({s_hash})";
+                    ms.NameLower = ms.Name.ToLowerInvariant();
+                    ms.NameHash = new MetaHash(hash);
+                    ms.Models = new AmbientModel[] { };
+                    PedModelSets.Add(hash, ms);
+                }
                 return ms;
             }
         }
@@ -1692,7 +1701,16 @@ namespace CodeWalker.World
             {
                 if (VehicleModelSets == null) return null;
                 AmbientModelSet ms;
-                VehicleModelSets.TryGetValue(hash, out ms);
+                if(!VehicleModelSets.TryGetValue(hash, out ms))
+                {
+                    string s_hash = hash.ToString("X");
+                    ms = new AmbientModelSet();
+                    ms.Name = $"UNKNOWN VEHICLE MODELSET ({s_hash})";
+                    ms.NameLower = ms.Name.ToLowerInvariant();
+                    ms.NameHash = new MetaHash(hash);
+                    ms.Models = new AmbientModel[] {};
+                    VehicleModelSets.Add(hash, ms);
+                }
                 return ms;
             }
         }