added null pointer check
Merge branch 'master' of https://github.com/MusesProject/MusesClient.git