diff --git a/core/systems/HandleSys.cpp b/core/systems/HandleSys.cpp
index 047f07e3..d6c36812 100644
--- a/core/systems/HandleSys.cpp
+++ b/core/systems/HandleSys.cpp
@@ -493,7 +493,7 @@ HandleError HandleSystem::GetHandle(Handle_t handle,
 	unsigned int serial = (handle >> 16);
 	unsigned int index = (handle & HANDLESYS_HANDLE_MASK);
 
-	if (index == 0 || index == 0xFFFF)
+	if (index == 0 || index > m_HandleTail || index > HANDLESYS_MAX_HANDLES)
 	{
 		return HandleError_Index;
 	}