diff --git a/CHANGELOG.md b/CHANGELOG.md
index 217a836..17d4f0f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### Version 7.1.0.0
+
+- Added a workaround for a Blizzard bug causing errors in the Health status module ([ticket #859](https://wow.curseforge.com/addons/grid/tickets/859))
+
 ### Version 7.0.3.3
 
 - Really fixed the frames sometimes appearing behind the backdrop ([ticket #840](https://wow.curseforge.com/addons/grid/tickets/840))
diff --git a/Grid.toc b/Grid.toc
index 53e2b17..af83027 100755
--- a/Grid.toc
+++ b/Grid.toc
@@ -1,4 +1,4 @@
-## Interface: 70000
+## Interface: 70100
 ## Version: @project-version@
 
 ## Title: Grid
diff --git a/Statuses/Health.lua b/Statuses/Health.lua
index 1d8f579..126b8f3 100644
--- a/Statuses/Health.lua
+++ b/Statuses/Health.lua
@@ -193,6 +193,12 @@ end
 local UnitGUID, UnitHealth, UnitHealthMax, UnitIsConnected, UnitIsDeadOrGhost, UnitIsFeignDeath = UnitGUID, UnitHealth, UnitHealthMax, UnitIsConnected, UnitIsDeadOrGhost, UnitIsFeignDeath
 
 function GridStatusHealth:UpdateUnit(event, unitid, ignoreRange)
+	if not unitid then
+		-- 7.1: UNIT_HEALTH and UNIT_MAXHEALTH sometimes fire with no unit token
+		-- https://wow.curseforge.com/addons/grid/tickets/859
+		return
+	end
+
 	local guid = UnitGUID(unitid)
 
 	if not GridRoster:IsGUIDInRaid(guid) then