DDF-953 Fixed potential NPEs in Solr factory