Merge pull request #163 from raghavgautam/master

Tagging test as distributed
adding null check