Exception management (25/27)

Exception management