Updated error messages for greater clarity