Added more explicit error messages