diff --git a/skins/blizzard/raidui.lua b/skins/blizzard/raidui.lua
index 70d4a240..a35a3893 100644
--- a/skins/blizzard/raidui.lua
+++ b/skins/blizzard/raidui.lua
@@ -1,26 +1,25 @@
 pfUI:RegisterSkin("RaidUI", "vanilla", function ()
   HookAddonOrVariable("Blizzard_RaidUI", function()
 
-    for i = 1, NUM_RAID_GROUPS do
+    for i = 1, (NUM_RAID_GROUPS or 8) do
       local group = _G["RaidGroup"..i]
-      if group then
+      if group and group.GetRegions then
         StripTextures(group)
 
-        for j = 1, MEMBERS_PER_RAID_GROUP do
+        for j = 1, (MEMBERS_PER_RAID_GROUP or 5) do
           local slot = _G["RaidGroup"..i.."Slot"..j]
-          if slot then
+          if slot and slot.GetRegions then
             StripTextures(slot)
             CreateBackdrop(slot, nil, true)
             SetHighlight(slot, 1, 1, 0)
-
           end
         end
       end
     end
 
-    for i = 1, MAX_RAID_MEMBERS do
+    for i = 1, (MAX_RAID_MEMBERS or 40) do
       local button = _G["RaidGroupButton"..i]
-      if button then
+      if button and button.GetRegions then
         StripTextures(button)
         CreateBackdrop(button, nil, true)
         SetHighlight(button, 1, 1, 0)
@@ -31,4 +30,4 @@ pfUI:RegisterSkin("RaidUI", "vanilla", function ()
     if RaidFrameReadyCheckButton then SkinButton(RaidFrameReadyCheckButton) end
 
   end)
-end)
+end)
\ No newline at end of file