diff --git a/Wholly-BCC.toc b/Wholly-BCC.toc
index 944194b..9c0f9c6 100644
--- a/Wholly-BCC.toc
+++ b/Wholly-BCC.toc
@@ -1,8 +1,8 @@
-## Interface: 20501
+## Interface: 20502
 ## Title: Wholly
 ## Author: Scott M Harrison
 ## Notes: Shows quest database and map pins
-## Version: 084
+## Version: 085
 ## Dependencies: Grail
 ## OptionalDeps: LibStub, LibDataBroker, TomTom, Gatherer, Questie
 ## SavedVariablesPerCharacter: WhollyDatabase
diff --git a/Wholly-Classic.toc b/Wholly-Classic.toc
index 00f0744..e3222b6 100644
--- a/Wholly-Classic.toc
+++ b/Wholly-Classic.toc
@@ -1,8 +1,8 @@
-## Interface: 11307
+## Interface: 11400
 ## Title: Wholly
 ## Author: Scott M Harrison
 ## Notes: Shows quest database and map pins
-## Version: 084
+## Version: 085
 ## Dependencies: Grail
 ## OptionalDeps: LibStub, LibDataBroker, TomTom, Gatherer, Questie
 ## SavedVariablesPerCharacter: WhollyDatabase
diff --git a/Wholly.lua b/Wholly.lua
index 891998f..7155bcb 100644
--- a/Wholly.lua
+++ b/Wholly.lua
@@ -424,6 +424,8 @@
 --			Transforms the Wholly map button into one with just "W" and puts it at the top left of the map.
 --			Reintroduces some ability to filter Blizzard map pins in Retail.
 --			Changes retail interface to 90100.
+--		085	Updates _OnUpdate to ensure coordinates are returned before updating locations.
+--			Changes retail interface to 90105, BCC to 20502 and Classic to 11400.
 --
 --	Known Issues
 --
@@ -2640,7 +2642,7 @@ WorldMapFrame:AddDataProvider(self.mapPinsProvider)
 			self.lastUpdate = self.lastUpdate + elapsed
 			if self.lastUpdate < self.updateThreshold then return end
 			local x, y = Grail.GetPlayerMapPosition('player')
-			if self.previousX ~= x or self.previousY ~= y then
+			if x and y and (self.previousX ~= x or self.previousY ~= y) then
 				if nil ~= self.coordinates then
 					self.coordinates.text = strformat("%.2f, %.2f", x * 100, y * 100)
 				end
diff --git a/Wholly.toc b/Wholly.toc
index b7e7ccc..c5f22cb 100644
--- a/Wholly.toc
+++ b/Wholly.toc
@@ -1,8 +1,8 @@
-## Interface: 90100
+## Interface: 90105
 ## Title: Wholly
 ## Author: Scott M Harrison
 ## Notes: Shows quest database and map pins
-## Version: 084
+## Version: 085
 ## Dependencies: Grail
 ## OptionalDeps: LibStub, LibDataBroker, TomTom, Gatherer, Questie
 ## SavedVariablesPerCharacter: WhollyDatabase