added null checks to PvP methods