Guard against undefined / null placeholder values

@rev jbuchanan@
@bug W-2418070@
update gold file
Merge branch 'kris/master-pending-placeholder'