Fixup of more tolerance in case of invalid solr entity dereferencing

Fixup of 9f32493c3915425a150a47bcc4076216ee50aa42