Update notes for submitted changes

* Handle exceptions of handle_options