Little little cleanup
Fix NPE
Merge branch 'master' of https://github.com/games647/ScoreboardStats.git