Update notes for submitted changes

* Fix potential NPE