Fix NPE crash found in bugID 6548138210885632
Merge pull request #434 from timrae/bugID-6548138210885632

Fix NPE crash found in bugID 6548138210885632