Fixed sonar related issues, refactored UISClient exception generation