Simplify error catching
Some cleaning of Notifier API