Revert "sonar exception-related cleanups"

This reverts commit ebce34502a9cbe443e0d951b9331348c612f4387.