diff --git a/lua/acf/core/utilities/entity_tracking_sv.lua b/lua/acf/core/utilities/entity_tracking_sv.lua
index 5f5918b..b23ad43 100644
--- a/lua/acf/core/utilities/entity_tracking_sv.lua
+++ b/lua/acf/core/utilities/entity_tracking_sv.lua
@@ -4,7 +4,7 @@ local NextUpdate = 0
 local Entities   = {}
 local Ancestors  = {}
 
-local Whitelist = {
+local Whitelist  = {
 	-- Garry's Mod entities
 	gmod_wheel                 = true,
 	gmod_hoverball             = true,
@@ -50,6 +50,8 @@ local function GetAncestor(Entity)
 end
 
 local function UpdateValues(Entity)
+	if not IsValid(Entity) then return end
+
 	local PhysObj  = Entity:GetPhysicsObject()
 	local Velocity = Entity:GetVelocity()
 	local PrevPos  = Entity.Position