diff --git a/GatheringTracker.lua b/GatheringTracker.lua
index c568016..fae10c7 100644
--- a/GatheringTracker.lua
+++ b/GatheringTracker.lua
@@ -696,7 +696,15 @@ function GT:PrepareDataForDisplay(event, wait)
 
         if senderData.name == GT.Player and not GT.NotificationPause then
             GT.Debug("Trigger Notification Handler for all", 2)
-            GT:NotificationHandler("all", "all", playerTotals.countTotal[senderIndex], playerTotals.valueTotal[senderIndex])
+            local countTotal = 0
+            local valueTotal = 0
+            if playerTotals and playerTotals.countTotal and playerTotals.countTotal[senderIndex] then
+                countTotal = playerTotals.countTotal[senderIndex]
+            end
+            if playerTotals and playerTotals.valueTotal and playerTotals.valueTotal[senderIndex] then
+                valueTotal = playerTotals.valueTotal[senderIndex]
+            end
+            GT:NotificationHandler("all", "all", countTotal, valueTotal)
         end
     end
 
diff --git a/GatheringTracker.toc b/GatheringTracker.toc
index 3a07db0..5f6327e 100644
--- a/GatheringTracker.toc
+++ b/GatheringTracker.toc
@@ -2,7 +2,7 @@
 ## Title: Gathering Tracker
 ## Notes: Addon for tracking gathered items, supports solo players and groups
 ## Author: Noshei
-## Version: 2.0.3
+## Version: 2.0.4
 ## OptionalDeps: TradeSkillMaster
 ## SavedVariables: GatheringTrackerDB
 ## AddonCompartmentFunc: GatheringTracker_OnAddonCompartmentClick