diff --git a/IceCore.lua b/IceCore.lua
index 6cedc27..e4c2be6 100644
--- a/IceCore.lua
+++ b/IceCore.lua
@@ -646,7 +646,7 @@ function IceCore.prototype:ConfigModeToggle(bWantConfig)
 			end
 
 			-- blank the bottom text that we set before. if the module uses this text, it will reset itself on redraw
-			if self.elements[i].IsBarElement then
+			if self.elements[i].IsBarElement and self.elements[i].frame then
 				self.elements[i]:SetBottomText1()
 			end
 
diff --git a/IceUnitBar.lua b/IceUnitBar.lua
index be30de5..6aae65e 100644
--- a/IceUnitBar.lua
+++ b/IceUnitBar.lua
@@ -222,7 +222,8 @@ function IceUnitBar.prototype:Update()
 	self.maxMana = UnitPowerMax(self.unit)
 	self.manaPercentage = self.maxMana ~= 0 and (self.mana/self.maxMana) or 0
 
-	_, self.unitClass = UnitClass(self.unit)
+	local locClass
+	locClass, self.unitClass = UnitClass(self.unit)
 
 	if( self.moduleSettings.scaleHealthColor ) then
 		if self.healthPercentage > 0.5 then