1 files changed, 8 insertions, 9 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 749837f7d..b4fc4fad0 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -343,16 +343,15 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
         {
             case AVATAR_PLAYER:
             {
-                Being* being = actorSpriteManager->findBeingByName(
-                    model->getAvatarAt(selected)->getName(), Being::PLAYER);
-                if (being)
+                Avatar *avatar = model->getAvatarAt(selected);
+                if (avatar)
                 {
-                    viewport->showPopup(being);
-                }
-                else
-                {
-                    viewport->showPlayerPopup(
-                        model->getAvatarAt(selected)->getName());
+                    Being* being = actorSpriteManager->findBeingByName(
+                        avatar->getName(), Being::PLAYER);
+                    if (being)
+                        viewport->showPopup(being);
+                    else
+                        viewport->showPlayerPopup(avatar->getName());
                 }
                 break;
             }