fixing null bug and another random inconsequential error
build
Merge pull request #599 from theresaanna/master

Fixing null issue