Fixed null check
Started on factions support