[ATM][SONAR] Fixx Sonar exceptions