Update notes for submitted changes

* Fix exception handling