diff --git a/LibDogTag-Unit-3.0.lua b/LibDogTag-Unit-3.0.lua
index 0426667..46a3063 100644
--- a/LibDogTag-Unit-3.0.lua
+++ b/LibDogTag-Unit-3.0.lua
@@ -220,9 +220,11 @@ local function refreshGUID(unit)
 	unitToGUID[unit] = guid
 	if oldGuid then
 		local guidToUnits_oldGuid = guidToUnits[oldGuid]
-		guidToUnits_oldGuid[unit] = nil
-		if not next(guidToUnits_oldGuid) then
-			guidToUnits[oldGuid] = del(guidToUnits_oldGuid)
+		if guidToUnits_oldGuid then
+			guidToUnits_oldGuid[unit] = nil
+			if not next(guidToUnits_oldGuid) then
+				guidToUnits[oldGuid] = del(guidToUnits_oldGuid)
+			end
 		end
 	end