fixed null issue
Merge pull request #1640 from nutan-gooru/dev-branch

fixed null issue