Added more helpful error messages