quick nullcheck fix
Merge branch 'master' of github.com:enjalot/tributary