Error display: Updated to be easily adaptable to different objects.
Merge remote-tracking branch 'upstream/master'