Started adding validation error messages