diff --git a/modules/panel.lua b/modules/panel.lua
index eb5d29ea..3c67fc35 100644
--- a/modules/panel.lua
+++ b/modules/panel.lua
@@ -255,7 +255,11 @@ pfUI:RegisterModule("panel", function ()
     local online = GetNumGuildMembers()
     local all = GetNumGuildMembers(true)
     local click = function() ToggleFriendsFrame(3) end
-    pfUI.panel:OutputPanel("guild", "Guild: "..online, nil, click)
+    if not GetGuildInfo("player") then
+      pfUI.panel:OutputPanel("guild", "Guild: N/A", nil, click)
+    else
+      pfUI.panel:OutputPanel("guild", "Guild: "..online, nil, click)
+    end
   end
 
   -- Update "durability"