Exception management (5/27)

Exception management