Exception management (9/27)

Exception management