[ATM][SONAR] Fix exceptions[p3]