From 55eb97a87def0f408a973d41603cbb1410cdffc8 Mon Sep 17 00:00:00 2001
From: Yonatan Abergel <82711045+theyonatan@users.noreply.github.com>
Date: Tue, 9 Jun 2026 19:09:21 +0300
Subject: [PATCH] Refactor NetworkBehaviour ToString method for null safety

---
 .../Runtime/Object/NetworkBehaviour/NetworkBehaviour.cs    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Assets/FishNet/Runtime/Object/NetworkBehaviour/NetworkBehaviour.cs b/Assets/FishNet/Runtime/Object/NetworkBehaviour/NetworkBehaviour.cs
index 4c5ba26d..b67894f7 100644
--- a/Assets/FishNet/Runtime/Object/NetworkBehaviour/NetworkBehaviour.cs
+++ b/Assets/FishNet/Runtime/Object/NetworkBehaviour/NetworkBehaviour.cs
@@ -101,7 +101,10 @@ public byte ComponentIndex
         /// <returns></returns>
         public override string ToString()
         {
-            return $"Name [{gameObject.name}] ComponentId [{ComponentIndex}] NetworkObject Name [{_networkObjectCache.name}] NetworkObject Id [{_networkObjectCache.ObjectId}]";
+            string networkObjectName = _networkObjectCache?.name ?? "Null";
+            int networkObjectId = _networkObjectCache?.ObjectId ?? -1;
+        
+            return $"Name [{gameObject.name}] ComponentId [{ComponentIndex}] NetworkObject Name [{networkObjectName}] NetworkObject Id [{networkObjectId}]";
         }
 
         [MakePublic]
@@ -277,4 +280,4 @@ void AlertToDuplicateNetworkObjects(Transform t)
         }
         #endregion
     }
-}
\ No newline at end of file
+}