update to improves error messages