Fixing null reference issue.
5.4.3