diff --git a/env/fonts.lua b/env/fonts.lua
index b252b7a7..21a24c32 100644
--- a/env/fonts.lua
+++ b/env/fonts.lua
@@ -6,7 +6,7 @@ else
 end
 
 function pfUI.environment:UpdateFonts()
-  if pfUI_config and pfUI_config.global.font_default then
+  if pfUI_config and pfUI_config.global and pfUI_config.global.font_default then
     pfUI.font_default = "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf"
     pfUI.font_combat =  "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_combat .. ".ttf"
     pfUI.font_square = "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf"
diff --git a/pfUI.lua b/pfUI.lua
index d2cbbc33..d5fe89a7 100644
--- a/pfUI.lua
+++ b/pfUI.lua
@@ -126,7 +126,7 @@ function pfUI.firstrun:AddStep(name, yfunc, nfunc, descr, cmpnt)
 end
 
 function pfUI.firstrun:NextStep()
-  if next(pfUI_init) == nil then
+  if pfUI_init and next(pfUI_init) == nil then
     local yes = function()
       this:GetParent():Hide()
       pfUI_init["welcome"] = true