Update scripts with respect to error messages