Exception management (10/27)

Exception management