diff --git a/ElvUI/Core/toolkit.lua b/ElvUI/Core/toolkit.lua
index e74f208..42c0260 100644
--- a/ElvUI/Core/toolkit.lua
+++ b/ElvUI/Core/toolkit.lua
@@ -288,6 +288,8 @@ function E:FontTemplate(fs, font, fontSize, fontStyle)
 end
 
 function E:StyleButton(button, noHover, noPushed, noChecked)
+
+	if not button then return end
 	if button.SetHighlightTexture and not button.hover and not noHover then
 		local hover = button:CreateTexture()
 		hover:SetTexture(1, 1, 1, 0.3)
diff --git a/ElvUI/Modules/Tooltip/Tooltip.lua b/ElvUI/Modules/Tooltip/Tooltip.lua
index 71db949..141b272 100644
--- a/ElvUI/Modules/Tooltip/Tooltip.lua
+++ b/ElvUI/Modules/Tooltip/Tooltip.lua
@@ -198,7 +198,8 @@ function TT:UPDATE_MOUSEOVER_UNIT(_, unit)
 			local diffColor = GetQuestDifficultyColor(level)
 
 			if UnitIsPVP(unit) then
-				pvpFlag = format(" (%s)", HELPFRAME_HOME_ISSUE3_HEADER)
+				local pvpText = HELPFRAME_HOME_ISSUE3_HEADER or "PVP"
+				pvpFlag = format(" (%s)", pvpText)
 			end
 
 			levelLine:SetText(format("|cff%02x%02x%02x%s|r%s %s%s", diffColor.r * 255, diffColor.g * 255, diffColor.b * 255, level > 0 and level or "??", classification[creatureClassification] or "", creatureType or "", pvpFlag))