From 0f45443771cd672304f42ece126d5a45df306b86 Mon Sep 17 00:00:00 2001
From: w0wca7a <154334645+w0wca7a@users.noreply.github.com>
Date: Tue, 12 May 2026 22:48:34 +0300
Subject: [PATCH 1/2] Update EntityComponentToTransformLinkInfo.cs

fix exception when entity has not been re-parented yet
---
 .../ValueConverters/EntityComponentToTransformLinkInfo.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/editor/Stride.Assets.Presentation/ValueConverters/EntityComponentToTransformLinkInfo.cs b/sources/editor/Stride.Assets.Presentation/ValueConverters/EntityComponentToTransformLinkInfo.cs
index ad27aeeb3e..f43652cd99 100644
--- a/sources/editor/Stride.Assets.Presentation/ValueConverters/EntityComponentToTransformLinkInfo.cs
+++ b/sources/editor/Stride.Assets.Presentation/ValueConverters/EntityComponentToTransformLinkInfo.cs
@@ -19,7 +19,7 @@ public override object Convert(object value, Type targetType, object parameter,
             if (string.IsNullOrEmpty(modelNodeLinkComponent?.NodeName))
                 return DependencyProperty.UnsetValue;
 
-            if (modelNodeLinkComponent.Target != null && !string.IsNullOrEmpty(modelNodeLinkComponent.NodeName))
+            if (modelNodeLinkComponent.Target?.Entity != null && !string.IsNullOrEmpty(modelNodeLinkComponent.NodeName))
             {
                 var entity = modelNodeLinkComponent.Target.Entity;
                 return $"{entity.Name}.{modelNodeLinkComponent.NodeName}";

From 4014fafc4f6891637931e87ed6cfe86abe37467c Mon Sep 17 00:00:00 2001
From: w0wca7a <154334645+w0wca7a@users.noreply.github.com>
Date: Tue, 12 May 2026 23:08:29 +0300
Subject: [PATCH 2/2] Update ModelComponent.cs

fix null model when CheckSkeleton() triggered.
model reference is restored later in the reconcile pass
---
 sources/engine/Stride.Engine/Engine/ModelComponent.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sources/engine/Stride.Engine/Engine/ModelComponent.cs b/sources/engine/Stride.Engine/Engine/ModelComponent.cs
index de85a667ec..63231b8c76 100644
--- a/sources/engine/Stride.Engine/Engine/ModelComponent.cs
+++ b/sources/engine/Stride.Engine/Engine/ModelComponent.cs
@@ -124,6 +124,9 @@ public SkeletonUpdater Skeleton
 
         private void CheckSkeleton()
         {
+            if (model is null)
+                return;
+                
             if (modelViewHierarchyDirty || meshInfos.Count != model.Meshes.Count)
             {
                 ModelUpdated();