Issue #2985907 by pasan.gamage, acbramley, dawehner, alexpott, DYdave: Add entity type into error description