Handle NPE
Merge pull request #50 from denuwanthi/release-4.3.0

Handle NPE