diff --git a/src/Mono/PlayerInfoDisplay.cs b/src/Mono/PlayerInfoDisplay.cs
index f32ca74..ac0d8a3 100644
--- a/src/Mono/PlayerInfoDisplay.cs
+++ b/src/Mono/PlayerInfoDisplay.cs
@@ -126,7 +126,7 @@ internal class PlayerInfoDisplay : MonoBehaviour
         if (Time.frameCount - _lastUpdateFrame < UPDATE_COOLDOWN)
             return;
 
-        if (_player == null || _player.Data == null || _nameText == null)
+        if (_player == null || _player.Data == null || _player.Data.ExtendedData() == null || _nameText == null)
         {
             ResetText();
             return;
diff --git a/src/Patches/Gameplay/UI/GameSummaryPatch.cs b/src/Patches/Gameplay/UI/GameSummaryPatch.cs
index 7fbc8a6..853162c 100644
--- a/src/Patches/Gameplay/UI/GameSummaryPatch.cs
+++ b/src/Patches/Gameplay/UI/GameSummaryPatch.cs
@@ -186,6 +186,9 @@ internal static class GameSummaryPatch
 
         foreach (var playerData in playersData)
         {
+            if (playerData == null)
+                continue;
+
             var playerLine = BuildPlayerLine(playerData);
             stringBuilder.AppendLine($"- {playerLine}\n");
             Logger_.Log(playerLine.Replace("\n", " "), "GameSummary");