Fix [SonarQube] Exception handlers should provide some context and
preserve the original exception