diff --git a/browser/lib/plunder/attack.ts b/browser/lib/plunder/attack.ts
index e881d1d5..7b71e8a8 100644
--- a/browser/lib/plunder/attack.ts
+++ b/browser/lib/plunder/attack.ts
@@ -1,5 +1,5 @@
 import { useEventListener, useMutationObserver } from '@vueuse/core';
-import { assertInteger, isInstanceOf, assertString, assert } from '@tb-dev/ts-guard';
+import { assertInteger, isInstanceOf, assertString } from '@tb-dev/ts-guard';
 import { usePlunderConfigStore } from '$renderer/stores/plunder';
 import { generateRandomDelay } from '$global/helpers';
 import { wait } from '$browser/utils/helpers';
@@ -103,7 +103,10 @@ export async function sendAttackFromPlace(units: PlaceUnitsAmount): Promise<bool
             assertString(unitName, `Could not determine unit name from class "${elClass}".`);
             const unitAmount = unit.parseIntStrict(10, false);
             assertInteger(unitAmount, `Could not determine ${unitName} amount.`);
-            assert(unitAmount === units[unitName], `${unitName} amount is not equal to the required amount.`);
+
+            if (unitAmount !== units[unitName]) {
+                throw new PlunderError(`${unitName} amount is not equal to the required amount.`);
+            };
         };
 
         await sendAttack(confirmationButton);
diff --git a/browser/lib/plunder/wall.ts b/browser/lib/plunder/wall.ts
index fda8b760..2043f767 100644
--- a/browser/lib/plunder/wall.ts
+++ b/browser/lib/plunder/wall.ts
@@ -5,6 +5,7 @@ import { openPlace } from '$lib/plunder/place';
 import { sendAttackFromPlace } from '$lib/plunder/attack';
 import { PlunderError } from '$browser/error';
 import { PlunderAttackWithLoot } from '$lib/plunder/resources';
+import { queryAvailableUnits } from '$lib/plunder/units';
 import type { DemolitionTroops, StringWallLevel } from '$types/game';
 import type { PlunderTargetInfo } from '$browser/lib/plunder/targets';
 
@@ -19,6 +20,7 @@ export async function destroyWall(info: PlunderTargetInfo): Promise<boolean> {
         const neededUnits = demolitionTemplate.units[info.wallLevel.toString(10) as StringWallLevel];
 
         // Verifica se há unidades o suficiente para destruir a muralha.
+        await queryAvailableUnits();
         const unitStore = useUnitsStore();
         for (const [key, value] of Object.entries(neededUnits) as [keyof DemolitionTroops, number][]) {
             if (unitStore[key] < value) return false;