Exception management (3/27)

Exception management