Update notes for submitted changes

* Improve coherence of exceptions handling