Refactor error messages to work for entries as well