diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index fcbb965e..a7c3cc5a 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -626,12 +626,12 @@ namespace PckStudio
 					if (!GameModelImporter.ModelMetaData.ContainsKey(modelName) || GameModelImporter.ModelMetaData[modelName]?.TextureLocations?.Length <= 0)
 						return Enumerable.Empty<NamedTexture>();
 
-					return GameModelImporter.ModelMetaData[modelName].TextureLocations.Select(texturePath =>
+					return GameModelImporter.ModelMetaData[modelName].TextureLocations
+						.Where(texturePath => currentPCK.Contains(texturePath + ".png", PckAssetType.TextureFile) || currentPCK.Contains(texturePath + ".tga", PckAssetType.TextureFile))
+                        .Select(texturePath =>
 					{
-						if (currentPCK.TryGetAsset(texturePath + ".png", PckAssetType.TextureFile, out PckAsset modelTextureAsset) ||
-							currentPCK.TryGetAsset(texturePath + ".tga", PckAssetType.TextureFile, out modelTextureAsset))
+						PckAsset modelTextureAsset = currentPCK.GetAsset(texturePath + ".png", PckAssetType.TextureFile) ?? currentPCK.GetAsset(texturePath + ".tga", PckAssetType.TextureFile);
 							return new NamedTexture(Path.GetFileName(texturePath), modelTextureAsset.GetTexture());
-						return default!;
                     });
                 }