Fixes for null object reference issues
Merge pull request #63 from kaltura/3.0.9.14.2

Fixes for null object reference issues