SRAMP-612 exceptions cleanup