diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp
index 0d70decb5d2..dc0a2aea105 100644
--- a/src/game/GroupHandler.cpp
+++ b/src/game/GroupHandler.cpp
@@ -361,10 +361,12 @@ void WorldSession::HandleGroupSetLeaderOpcode(WorldPacket& recv_data)
 
 void WorldSession::HandleGroupDisbandOpcode(WorldPacket& /*recv_data*/)
 {
-    if (!GetPlayer()->GetGroup())
+    Player* player = GetPlayer();
+    Group* group = player->GetGroup();
+    if (!group)
         return;
 
-    if (_player->InBattleGround())
+    if (player->InBattleGround())
     {
         SendPartyResult(PARTY_OP_INVITE, "", ERR_INVITE_RESTRICTED);
         return;
@@ -374,9 +376,9 @@ void WorldSession::HandleGroupDisbandOpcode(WorldPacket& /*recv_data*/)
     /********************/
 
     // everything is fine, do it
-    SendPartyResult(PARTY_OP_LEAVE, GetPlayer()->GetName(), ERR_PARTY_RESULT_OK);
+    SendPartyResult(PARTY_OP_LEAVE, player->GetName(), ERR_PARTY_RESULT_OK);
 
-    GetPlayer()->RemoveFromGroup();
+    player->RemoveFromGroup();
 }
 
 void WorldSession::HandleMinimapPingOpcode(WorldPacket& recv_data)