Fix lint errors
More explicit error messages