Re #9386. Rethrow original exception, not a copy.
Re #9386. Pass string by reference instead of value.
Re #9386. Remove now-unused parameter.
Merge remote-tracking branch 'origin/bugfix/9386_cppcheck_warnings'