Fix null value of additional entity when no additional entities are uploaded

Fix null value of additional entity when no additional entities are uploaded #1438