[Bug Fix] #389182 Fixes NPE
Merge pull request #58 from diutsu/develop

[Bug Fix] #389182 Fixes NPE