Fix exceptions failures