Exception management (8/27)

Exception management