Ensure we dont add null entities in to search document list