Fix for some new null data
Merge branch 'master' of git@github.com:robrua/Orianna.git