diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp
index 6ce4f277..19eb5168 100644
--- a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp
+++ b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp
@@ -218,7 +218,7 @@ namespace SHADE
     EntityID result = MAX_EID;
     for (auto& entity : entityVec)
     {
-      if (entity->name == name)
+      if (entity && entity->name == name)
         result = entity->GetEID();
     }
     return result;