tidy sonar exceptions