Add more informative error messages