Update notes for submitted changes

* Simplify error handling