Update to fix of null pointer
Merge pull request #899 from Bars107/bugfixing

Update to fix of null pointer