CDH-19024: Rethrow rather than swallow root exception