[nosvideo] Make more robust against missing metadata
Merge remote-tracking branch 'naglis/nosvideo'