Adding more error messages