diff --git a/DPSMate/DPSMate.lua b/DPSMate/DPSMate.lua
index 27338bf..3f9a84b 100644
--- a/DPSMate/DPSMate.lua
+++ b/DPSMate/DPSMate.lua
@@ -1,6 +1,6 @@
 -- Global Variables
 DPSMate = {}
-DPSMate.VERSION = 103
+DPSMate.VERSION = 104
 DPSMate.LOCALE = GetLocale()
 DPSMate.SYNCVERSION = DPSMate.VERSION..DPSMate.LOCALE
 DPSMate.Parser = CreateFrame("Frame", nil, UIParent)
diff --git a/DPSMate/DPSMate_Parser.lua b/DPSMate/DPSMate_Parser.lua
index 9661718..5042fec 100644
--- a/DPSMate/DPSMate_Parser.lua
+++ b/DPSMate/DPSMate_Parser.lua
@@ -502,9 +502,9 @@ function DPSMate.Parser:GetPlayerValues()
 	DPSMatePlayer[1] = self.player
 	DPSMatePlayer[2] = playerclass
 	local _, fac = UnitFactionGroup("player")
-	if fac == "Alliance" then
+	if string.find(fac, "lliance") then
 		DPSMatePlayer[3] = 1
-	elseif fac == "Horde" then
+	elseif string.find(fac, "orde") then
 		DPSMatePlayer[3] = -1
 	end
 	DPSMatePlayer[4] = GetRealmName()
diff --git a/DPSMate/Damage/DPSMate_DPS.lua b/DPSMate/Damage/DPSMate_DPS.lua
index f24f8d6..df1e152 100644
--- a/DPSMate/Damage/DPSMate_DPS.lua
+++ b/DPSMate/Damage/DPSMate_DPS.lua
@@ -72,7 +72,7 @@ function DPSMate.Modules.DPS:EvalTable(user, k, cbt)
 	local arr, cbet = DPSMate:GetMode(k)
 	cbt = cbt or cbet
 	if not arr[user[1]] then return end
-	if (user[5] and user[5] ~= DPSMate.L["unknown"] and arr[DPSMateUser[user[5]][1]]) and DPSMateSettings["mergepets"] and DPSMateUser[user[5]][1]~=user[1] then u={user[1],DPSMateUser[user[5]][1]} else u={user[1]} end
+	if (user and user[5] and user[5] ~= DPSMate.L["unknown"] and DPSMateUser[user[5]] and arr[DPSMateUser[user[5]][1]]) and DPSMateSettings["mergepets"] and DPSMateUser[user[5]][1]~=user[1] then u={user[1],DPSMateUser[user[5]][1]} else u={user[1]} end
 	for _, v in pairs(u) do
 		for cat, val in pairs(arr[v]) do
 			if (type(val) == "table" and cat~="i") then
diff --git a/DPSMate/Damage/DPSMate_Damage.lua b/DPSMate/Damage/DPSMate_Damage.lua
index 86cec9e..6a001a3 100644
--- a/DPSMate/Damage/DPSMate_Damage.lua
+++ b/DPSMate/Damage/DPSMate_Damage.lua
@@ -69,7 +69,7 @@ function DPSMate.Modules.Damage:EvalTable(user, k)
 	local a, u, p, d, total, pet = {}, {}, {}, {}, 0, false
 	local arr = DPSMate:GetMode(k)
 	if not arr[user[1]] then return end
-	if (user[5] and user[5] ~= DPSMate.L["unknown"] and arr[DPSMateUser[user[5]][1]]) and DPSMateSettings["mergepets"] and DPSMateUser[user[5]][1]~=user[1] then u={user[1],DPSMateUser[user[5]][1]} else u={user[1]} end
+	if (user and user[5] and user[5] ~= DPSMate.L["unknown"] and DPSMateUser[user[5]] and arr[DPSMateUser[user[5]][1]]) and DPSMateSettings["mergepets"] and DPSMateUser[user[5]][1]~=user[1] then u={user[1],DPSMateUser[user[5]][1]} else u={user[1]} end
 	for _, v in pairs(u) do
 		for cat, val in pairs(arr[v]) do
 			if (type(val) == "table" and cat~="i") then