Better handle end of game flow.