[AMW-200] improved error output
[AMW-199] improved update output