diff --git a/env/locales_deDE.lua b/env/locales_deDE.lua
index f6e76750..9b74ce77 100644
--- a/env/locales_deDE.lua
+++ b/env/locales_deDE.lua
@@ -53,7 +53,7 @@ pfLocaleSpellInterrupts["deDE"] = {
 }
 
 pfLocaleHunterbars["deDE"] = {
-  ["MELEE"] = "Raptorstoß",
+  ["MELEE"] = "Zurechtstutzen",
   ["RANGED"] = "Arkaner Schuss",
 }
 
diff --git a/env/locales_enUS.lua b/env/locales_enUS.lua
index 0b6eb71b..7ac25f98 100644
--- a/env/locales_enUS.lua
+++ b/env/locales_enUS.lua
@@ -53,7 +53,7 @@ pfLocaleSpellInterrupts["enUS"] = {
 }
 
 pfLocaleHunterbars["enUS"] = {
-  ["MELEE"] = "Raptor Strike",
+  ["MELEE"] = "Wing Clip",
   ["RANGED"] = "Arcane Shot",
 }
 
diff --git a/env/locales_frFR.lua b/env/locales_frFR.lua
index b35a21c3..b976ee7a 100644
--- a/env/locales_frFR.lua
+++ b/env/locales_frFR.lua
@@ -53,7 +53,7 @@ pfLocaleSpellInterrupts["frFR"] = {
 }
 
 pfLocaleHunterbars["frFR"] = {
-  ["MELEE"] = "Attaque du raptor",
+  ["MELEE"] = "Coupure d'ailes",
   ["RANGED"] = "Tir des Arcanes",
 }
 
diff --git a/env/locales_ruRU.lua b/env/locales_ruRU.lua
index 7cca6566..3d5f5392 100644
--- a/env/locales_ruRU.lua
+++ b/env/locales_ruRU.lua
@@ -53,7 +53,7 @@ pfLocaleSpellInterrupts["ruRU"] = {
 }
 
 pfLocaleHunterbars["ruRU"] = {
-  ["MELEE"] = "Удар ящера",
+  ["MELEE"] = "Подрезать крылья",
   ["RANGED"] = "Чародейский выстрел",
 }
 
diff --git a/env/locales_zhCN.lua b/env/locales_zhCN.lua
index 5d3a4612..9c35c41a 100644
--- a/env/locales_zhCN.lua
+++ b/env/locales_zhCN.lua
@@ -53,7 +53,7 @@ pfLocaleSpellInterrupts["zhCN"] = {
 }
 
 pfLocaleHunterbars["zhCN"] = {
-  ["MELEE"] = "猛禽一击",
+  ["MELEE"] = "摔绊",
   ["RANGED"] = "奥术射击",
 }
 
diff --git a/modules/hunterbar.lua b/modules/hunterbar.lua
index b66c567a..10d6c965 100644
--- a/modules/hunterbar.lua
+++ b/modules/hunterbar.lua
@@ -21,7 +21,8 @@ pfUI:RegisterModule("hunterbar", function ()
 
       pfUI.hunterbar.scanner:ClearLines()
       pfUI.hunterbar.scanner:SetAction(i)
-      if pfHunterBarScannerTextLeft1 then
+
+      if pfHunterBarScannerTextLeft1 and pfHunterBarScannerTextLeft1:GetText() then
         if pfHunterBarScannerTextLeft1:GetText() == pfLocaleHunterbars[pfUI.cache["locale"]]["MELEE"] then
           pfUI.hunterbar.melee = i
         elseif pfHunterBarScannerTextLeft1:GetText() == pfLocaleHunterbars[pfUI.cache["locale"]]["RANGED"] then