Added more descriptive error messages