Exception management (24/27)

Exception management