Refs #21161 Be robust towards null fields