diff --git a/Moose Development/Moose/Core/ClientMenu.lua b/Moose Development/Moose/Core/ClientMenu.lua
index dae6195d2..59ec7169c 100644
--- a/Moose Development/Moose/Core/ClientMenu.lua	
+++ b/Moose Development/Moose/Core/ClientMenu.lua	
@@ -417,7 +417,7 @@ end
 CLIENTMENUMANAGER = {
   ClassName = "CLIENTMENUMANAGER",
   lid = "",
-  version = "0.1.5a",
+  version = "0.1.6",
   name = nil,
   clientset = nil,
   menutree = {},
@@ -740,7 +740,7 @@ function CLIENTMENUMANAGER:AddEntry(Entry,Client)
   for _,_client in pairs(Set) do
     local client = _client -- Wrapper.Client#CLIENT
     if client and client:IsAlive() then
-      local playername = client:GetPlayerName()
+      local playername = client:GetPlayerName() or "None"
       local unitname = client:GetName()
       if not knownunits[unitname] then
         knownunits[unitname] = true
diff --git a/Moose Development/Moose/Core/Settings.lua b/Moose Development/Moose/Core/Settings.lua
index 5f814b9df..81a60a7f8 100644
--- a/Moose Development/Moose/Core/Settings.lua	
+++ b/Moose Development/Moose/Core/Settings.lua	
@@ -740,7 +740,7 @@ do -- SETTINGS
     if _SETTINGS.ShowPlayerMenu == true then
 
       local PlayerGroup = PlayerUnit:GetGroup()
-      local PlayerName = PlayerUnit:GetPlayerName()
+      local PlayerName = PlayerUnit:GetPlayerName() or "None"
       --local PlayerNames = PlayerGroup:GetPlayerNames()
 
       local PlayerMenu = MENU_GROUP:New( PlayerGroup, 'Settings "' .. PlayerName .. '"' )