diff --git a/Source/Game/Chat/Commands/GoCommands.cs b/Source/Game/Chat/Commands/GoCommands.cs
index 10e5f9702..83bc0e24c 100644
--- a/Source/Game/Chat/Commands/GoCommands.cs
+++ b/Source/Game/Chat/Commands/GoCommands.cs
@@ -544,7 +544,7 @@ namespace Game.Chat.Commands
         class GoCommandGameobject
         {
             [Command("", RBACPermissions.CommandGo)]
-            static bool HandleGoGameObjectSpawnIdCommand(CommandHandler handler, uint spawnId)
+            static bool HandleGoGameObjectSpawnIdCommand(CommandHandler handler, ulong spawnId)
             {
                 GameObjectData spawnpoint = Global.ObjectMgr.GetGameObjectData(spawnId);
                 if (spawnpoint == null)
diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs
index a2b2e7063..73f9b6336 100644
--- a/Source/Game/Globals/ObjectManager.cs
+++ b/Source/Game/Globals/ObjectManager.cs
@@ -5699,6 +5699,7 @@ namespace Game
             uint count = 0;
             do
             {
+                ushort instanceMapId = result.Read<ushort>(0);
                 uint spawnGroupId = result.Read<uint>(3);
                 var spawnGroupTemplate = _spawnGroupDataStorage.LookupByKey(spawnGroupId);
                 if (spawnGroupTemplate == null || spawnGroupTemplate.flags.HasAnyFlag(SpawnGroupFlags.System))
@@ -5707,7 +5708,6 @@ namespace Game
                     continue;
                 }
 
-                ushort instanceMapId = result.Read<ushort>(0);
                 if (spawnGroupTemplate.mapId != instanceMapId)
                 {
                     Log.outError(LogFilter.Sql, $"Instance spawn group {spawnGroupId} specified for instance {instanceMapId} has spawns on a different map {spawnGroupTemplate.mapId}. Skipped.");