CAAERS-6863 fix NPE in amend flow