Update notes for submitted changes

* Rework exception handling