(Threaded video) Fix null pointer dereferences
Merge pull request #878 from heuripedes/master

(Threaded video) Fix null pointer dereferences