[BattleCollector] Replace throwable exception in remove