[enh] error handling for amendment view