Refined some error messages