Update notes for submitted changes

* Prevents forwarding more than once when handleError invoked more than once