Added more informative error messages