APY-54 : Error notifications refactoring

Finished error wrapping on a service level.