[WO-563] Add error messages