Fix crash on /makearena and when battles end