Fix null pointer at the end of a round