Update notes for submitted changes

* Cleanup exception handling on evacuate