Batch error messages changed for 2.1