Quick and dirty:  Add more informative errors.