Fixed TODO comments. GetBatch can now throw NotFoundException