Some exception handlers and collaborators are now added but not tested
Small error with exceptions