Updated error messages
Added sample entries