Exception management (20/27)

Exception management