Follow-up on review

- Corrected typo
- Added error messages