- Fixed NPE caused by Jhoira Avatar

git-svn-id: http://svn.slightlymagic.net/forge/trunk@25357 269b9781-a132-4a9b-9d4e-f004f1b56b58
- Fixed Serene Master

git-svn-id: http://svn.slightlymagic.net/forge/trunk@25360 269b9781-a132-4a9b-9d4e-f004f1b56b58