Reviewed-by: dholmes, lfoltan
Improve the message to display the right referring class. Reviewed-by: acorn, goetz, dholmes