Fix null entities.