SONAR-4304 better exception handling/UI