BattleHistory nullpointer fix