Exception management (15/27)

Exception management