Commit to fix the Null pointer issue...

Commit to fix the Null pointer issue...