51804253 improve custom error messages