Merge pull request #2221 from TheBlueMatt/2023-04-bp-exit-fast