Handle null videos appropriately

Auditors: mattdunnrankin