diff --git a/Assets/Scripts/Game/Modules/Character/CharacterModuleServer.cs b/Assets/Scripts/Game/Modules/Character/CharacterModuleServer.cs
index c457ccc3d..aaa5c4b29 100644
--- a/Assets/Scripts/Game/Modules/Character/CharacterModuleServer.cs
+++ b/Assets/Scripts/Game/Modules/Character/CharacterModuleServer.cs
@@ -106,7 +106,7 @@ public Character SpawnCharacter(GameWorld world, PlayerState owner, Vector3 posi
     {
         var heroTypeRegistry = resourceSystem.GetResourceRegistry<HeroTypeRegistry>();
 
-        heroIndex = Mathf.Min(heroIndex, heroTypeRegistry.entries.Count);
+        heroIndex = Mathf.Min(heroIndex, heroTypeRegistry.entries.Count-1);
         var heroTypeAsset = heroTypeRegistry.entries[heroIndex];
 
         var charPrefabGUID = m_settings.characterPrefab.guid;
diff --git a/Assets/Scripts/Game/Modules/HitCollision/HitCollisionSystems.cs b/Assets/Scripts/Game/Modules/HitCollision/HitCollisionSystems.cs
index d58ee1218..a922abb23 100644
--- a/Assets/Scripts/Game/Modules/HitCollision/HitCollisionSystems.cs
+++ b/Assets/Scripts/Game/Modules/HitCollision/HitCollisionSystems.cs
@@ -28,11 +28,12 @@ protected override void Initialize(ref ComponentGroup group)
             var hitCollHistoryEntity = hitCollHistory.gameObject.GetComponent<GameObjectEntity>().Entity;
             var externalSetup = hitCollHistory.settings.collisionSetup != null;
             var colliderSetup = externalSetup ? hitCollHistory.settings.collisionSetup.transform : hitCollHistory.transform;
+            
+            GameDebug.Assert(hitCollHistory.hitCollisionOwner != Entity.Null,"HitCollisionHistory requires HitCollisionOwner component");
+
             var hitCollisionOwner =
                 EntityManager.GetComponentObject<HitCollisionOwner>(hitCollHistory.hitCollisionOwner);
-            
-            GameDebug.Assert(hitCollHistory.hitCollisionOwner != null,"HitCollisionHistory requires HitCollisionOwner component");
-            
+
             // Find and disable all all colliders on collisionOwner
             var sourceColliders = new List<Collider>();
             RecursiveGetCollidersInChildren(colliderSetup.transform, sourceColliders);
diff --git a/Assets/Scripts/Game/Modules/ReplicatedEntity/ReplicatedEntityRegistry.cs b/Assets/Scripts/Game/Modules/ReplicatedEntity/ReplicatedEntityRegistry.cs
index 6f0bcf726..46164824c 100644
--- a/Assets/Scripts/Game/Modules/ReplicatedEntity/ReplicatedEntityRegistry.cs
+++ b/Assets/Scripts/Game/Modules/ReplicatedEntity/ReplicatedEntityRegistry.cs
@@ -176,7 +176,7 @@ public override bool Verify()
                 }
 
                 var replicatedEntity = go.GetComponent<ReplicatedEntity>();
-                if (go == null)
+                if (replicatedEntity == null)
                 {
                     Debug.Log(go + " has no ReplicatedEntity component");
                     verified = false;