1 files changed, 2 insertions, 0 deletions

diff --git a/src/ecs.cpp b/src/ecs.cpp
index 1fae912..f5c5e72 100644
--- a/src/ecs.cpp
+++ b/src/ecs.cpp
@@ -224,6 +224,8 @@ CompInstance *ECS_GetInstance(EntityHandle entHandle) {
 	auto i = Buckets_GetItemIndex(instanceHandle_t);
 	auto &comp = Comp_Instance_BucketContainer.buckets[b].instances[i];
 
+	if (comp.index >= grBinds.instances.Count())
+		return nullptr;
 	comp.ptr = &grBinds.instances[comp.index];
 	return ∁
 }