Update notes for submitted changes

* Implemented simple error handling behaviour