Exceptions handling refactoring
By mail activation