Sonar

Improve exception handling during code inspection