Some error messages changes