Fix error message to name the correct starting model.

It was partly superceded by 4b778774084c9c2ffe3e7bf62d0b544da681ec91 that's already been merged. I've merged (and forced)
just the test back onto this branch.
Merge branch 'fix_link_to_nonrelation_field_error_message_2'