From 7f0d606ccc4f21f9551e09aa28850775eb76df67 Mon Sep 17 00:00:00 2001
From: Sinematic3D <sinematic3D@gmail.com>
Date: Tue, 20 Jan 2026 02:21:27 +0100
Subject: [PATCH] Fix null reference exception when bone frame is not found

---
 AssetStudioFBXWrapper/FbxExporterContext.cs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/AssetStudioFBXWrapper/FbxExporterContext.cs b/AssetStudioFBXWrapper/FbxExporterContext.cs
index 8040d0c6c..d8fa9a47e 100644
--- a/AssetStudioFBXWrapper/FbxExporterContext.cs
+++ b/AssetStudioFBXWrapper/FbxExporterContext.cs
@@ -228,19 +228,18 @@ private void ExportMesh(ImportedFrame rootFrame, List<ImportedMaterial> material
 
                     foreach (var bone in boneList)
                     {
+                        var cluster = IntPtr.Zero;
                         if (bone.Path != null)
                         {
                             var frame = rootFrame.FindFrameByPath(bone.Path);
-                            var boneNode = _frameToNode[frame];
 
-                            var cluster = AsFbxMeshCreateCluster(_pContext, boneNode);
-
-                            AsFbxMeshAddCluster(pClusterArray, cluster);
-                        }
-                        else
-                        {
-                            AsFbxMeshAddCluster(pClusterArray, IntPtr.Zero);
+                            if (frame != null)
+                            {
+                                var boneNode = _frameToNode[frame];
+                                cluster = AsFbxMeshCreateCluster(_pContext, boneNode);
+                            }
                         }
+                        AsFbxMeshAddCluster(pClusterArray, cluster);
                     }
                 }