Paginated api call issue - Function do not call the last page

Hi folks!

I have an API endpoint, which returns data on a paginated way. I have created my function, and I used List.Generate() because for each page I call, I recieve my data, and a 'next' field, which tells me which, url has to be called next. If the next field is empty / blank, then I got to the last page, so the iterative api calling should stop. 

The problem is, that my function stops before it would call the last page. The reason is, that as I get to the last page the next field is empty, thus, the List.Generate() stops because of meeting the ExitCondition criteria. 

Does anyone has a clue, how to fix this issue?

My code can be seen below,

let
    fn_getExpData = (initialUrl as text) =>
    let
        BaseUrl = "https://xxx.xxxxx.xxxxx.co.hu/2/expenses",


        AllData = List.Generate(
            () => 
                [
                    CurrentUrl = initialUrl, 
                    Data = {}, 
                    Continue = true
                ], 
            each [Continue], 
            each 
                let
 
                    CurrentUrl = try [CurrentUrl] otherwise null,

 
                    ExitCondition = CurrentUrl = null,

 
                    QueryParts = if not ExitCondition and Text.Contains(CurrentUrl, "?") 
                        then Text.Split(Text.AfterDelimiter(CurrentUrl, "?"), "&") 
                        else {},

                    QueryNames = List.Transform(QueryParts, each Text.BeforeDelimiter(_, "=")),
                    QueryValues = List.Transform(QueryParts, each Text.AfterDelimiter(_, "=")),
                    QueryParams = if not ExitCondition then Record.FromList(QueryValues, QueryNames) else [],

 
                    Timestamp = DateTime.LocalNow(),

 
                    Response = if not ExitCondition 
                        then try Json.Document(Web.Contents(BaseUrl, [Query=QueryParams, Headers=[Authorization="Bearer " & Token]])) otherwise null
                        else null,
                    
 
                    DataChunk = try Response[results][expenses] otherwise {},

 
                    DataWithMetadata = if not ExitCondition then 
                        List.Transform(DataChunk, each 
                            Record.AddField(
                                Record.AddField(_, "API_URL", CurrentUrl), 
                                "Response_Timestamp", Timestamp
                            )
                        ) 
                        else {},
 
                    NextUrl = try Response[next] otherwise null,

 
                    NewContinue = NextUrl <> null and not ExitCondition
                in 
                    [
                        CurrentUrl = NextUrl, 
                        Data = DataWithMetadata, 
                        Continue = NewContinue
                    ],
            each [Data]
        ),

 
        FlattenedData = List.Combine(AllData)
    in 
        FlattenedData
in 
    fn_getExpData

Thanks in advance 

David