Exception management (16/27)

Exception management