Update notes for submitted changes

* fix possible NPE