Exception management (4/27)

Exception management