[ATM][SONAR] Fix Sonar exceptions