Update notes for submitted changes

* Replace some generic Exceptions with specific ones