ensure exit codes in more cases

[sophiajt]

Description

Another attempt to see if we can fix a potential cause for #4800

Tests

Make sure you've run and fixed any issues with these commands:

• cargo fmt --all -- --check to check standard code formatting (cargo fmt --all applies these changes)
• cargo clippy --all --all-features -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect to check that you're using the standard code style
• cargo build; cargo test --all --all-features to check that all the tests pass