Also switch some std::runtime_error catches into std::exception to improve reliability.
(cherry picked from commit 8ae7993e)
Also switch some std::runtime_error catches into std::exception to improve reliability.
(cherry picked from commit 8ae7993e)