Handle null custom entity names