APY-54 : Error notifications refactoring