Exception refactoring

Cf
https://medium.com/@clement_elbaz/we-need-to-talk-about-exceptions-e96bc9ceb76b