ofsoftswitch13: 0649800 Fix potential bug in handling metadata.