NPE & potentional bug fixes
Merge branch 'master' of https://github.com/eddy5641/LegendaryClient.git