Last minute changes for error handling and Game object cleanup