"null pointer exception handled"
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1
Merge pull request #2523 from suryanarayanakb/release-6.6.3.a1

Null pointer exception handled