sonar exception-related cleanups