Update notes for submitted changes

* Fix various exception paths