Follow-up from MR !682: Replace exit() calls with exceptions
Description
these were the changes in !682 (closed) that not made it into !687 (merged)
Test Plan
Should pass the CI
these were the changes in !682 (closed) that not made it into !687 (merged)
Should pass the CI