[ATM][SONAR] Fix exceptions