New content location null fix
Merge pull request #46 from chandramouleswaran/v0.2-alpha

New content location null fix