Fix to the mapper related entities when null
Fix to the mapper related entities when null

clarity-project/SolrBundle,clarity-project/SolrBundle,floriansemm/SolrBundle,zquintana/SunSearchBundle,drdk/SolrBundle,floriansemm/SolrBundle,zquintana/SunSearchBundle,drdk/SolrBundle