* Fix and saftey checks for avatar handling.