Format per coding standard
Fix [SonarQube] Exception handlers should provide some context and
preserve the original exception
Add logger
Format per coding standard