Fixed KT-5493: NPE fix
Merge pull request #497 from bintree/master

Fixed KT-5493: NPE fix