Add model name to ValidationError

Replacement for #2504 targeted at master 

Related to #2135

This gives an indication as to which model triggered the validation error.