More helpful error messages

Updated some of the error messages to refer to the actual entries where an error has occurred to help the user track down the problem.