Improve error messages when dealing with entity includes. PR: 10456 Submitted by: Jason Brittain <jasonb@collab.net>