Exception management (7/27)

Exception management