Fixes NullPointerException when initializing tree
Merge branch 'team9dev' into feature-endgamenotification