diff --git a/HealBot_Options_Buffs.lua b/HealBot_Options_Buffs.lua
index d849705..eb3a267 100644
--- a/HealBot_Options_Buffs.lua
+++ b/HealBot_Options_Buffs.lua
@@ -9,12 +9,12 @@ function HealBot_Options_BuffWatch_OnClick(self)
   else
     HealBot_Options_BuffWatchInCombat:Enable()
   end
-  HealBot_RecalcParty();
+  HealBot_Action_RefreshButtons(nil);
 end
 function HealBot_Options_BuffWatchInCombat_OnClick(self)
   local frame = self or this
   HealBot_Config.BuffWatchInCombat = frame:GetChecked() or 0;
-  HealBot_RecalcParty();
+  HealBot_Action_RefreshButtons(nil);
 end
 function HealBot_Options_BuffSelf_OnLoad(self)
   local frame = self or this
@@ -38,7 +38,7 @@ function HealBot_Options_BuffSelf_OnClick(self)
   else
     HealBot_Config.BuffWatchSelf[id] = 0
   end
-  HealBot_RecalcParty();
+  HealBot_Action_RefreshButtons(nil);
 end
 function HealBot_Options_Buff_OnLoad(self)
   local frame = self or this
@@ -80,7 +80,7 @@ function HealBot_Options_Buff_OnClick()
   
   HealBot_UIDropDownMenu_SetSelectedID(frame, this.value + 1)
   UIDropDownMenu_SetText(text, frame)
-  HealBot_RecalcParty();
+  HealBot_Action_RefreshButtons(nil);
 end
 function HealBot_Options_SetBuffs()
   local myClass = UnitClass("player")
diff --git a/HealBot_Options_CDC.lua b/HealBot_Options_CDC.lua
index c52de4b..387ff92 100644
--- a/HealBot_Options_CDC.lua
+++ b/HealBot_Options_CDC.lua
@@ -248,13 +248,13 @@ function HealBot_Options_Debuff_Reset()
   if classEN=="PRIEST" or classEN=="DRUID" or classEN=="PALADIN" or classEN=="SHAMAN" then
     local spell = HealBot_Config.CDCLeftText[UnitClass("player")];
     HealBot_DebuffWatch = {[HEALBOT_DISEASE_en]=false, [HEALBOT_MAGIC_en]=false, [HEALBOT_POISON_en]=false, [HEALBOT_CURSE_en]=false }
-    if spell ~= "None" then
+    if spell and spell ~= "None" and HealBot_Debuff_Types[spell] then
       table.foreach(HealBot_Debuff_Types[spell], function (index,debuff)
         HealBot_DebuffWatch[debuff]=true;
       end)
     end
     spell = HealBot_Config.CDCRightText[UnitClass("player")];
-    if spell ~= "None" then
+    if spell and spell ~= "None" and HealBot_Debuff_Types[spell] then
       table.foreach(HealBot_Debuff_Types[spell], function (index,debuff)
         HealBot_DebuffWatch[debuff]=true;
       end)