Add comments + add specifique exception