Null handling.
Merge pull request #1674 from kaltura/IX-9.19.2-PLAT-1554

Null handling.