Update notes for submitted changes

* Clean up exception handling