diff --git a/Categories/Characteristics.lua b/Categories/Characteristics.lua
index ed1ade9..f32de77 100644
--- a/Categories/Characteristics.lua
+++ b/Categories/Characteristics.lua
@@ -182,10 +182,10 @@ local function Class(unit)
 		return UnitClass(unit) or UNKNOWN
 	else
 		local classbase, classindex = UnitClassBase(unit)
-		if (wow_800 or WOW_PROJECT_ID) and GetClassInfo then
+		if GetClassInfo then
 			return classbase and GetClassInfo(classindex) or UNKNOWN
 		elseif LOCALIZED_CLASS_NAMES_MALE and LOCALIZED_CLASS_NAMES_FEMALE then
-			if UnitSex(unit) == 3 then
+			if UnitSex and UnitSex(unit) == 3 then
 				return LOCALIZED_CLASS_NAMES_FEMALE[classbase] or UNKNOWN
 			else
 				return LOCALIZED_CLASS_NAMES_MALE[classbase] or UNKNOWN