Prevent TypeError due to null
values in new elements
#12077
Merged
null
values in new elements
#12077