code review
Fix for the error messages