Put in clearer error messages
Put in clearer error messages