Fixing null refrence issue.
5.2.14