Exception management (22/27)

Exception management