diff --git a/src/data/move.ts b/src/data/move.ts
index a220df259..86de43fe4 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -3770,6 +3770,7 @@ export function initMoves() {
     new AttackMove(Moves.BRUTAL_SWING, "Brutal Swing", Type.DARK, MoveCategory.PHYSICAL, 60, 100, 20, -1, "The user swings its body around violently to inflict damage on everything in its vicinity.", -1, 0, 7)
       .target(MoveTarget.ALL_NEAR_OTHERS),
     new StatusMove(Moves.AURORA_VEIL, "Aurora Veil (N)", Type.ICE, -1, 20, -1, "This move reduces damage from physical and special moves for five turns. This can be used only in a hailstorm.", -1, 0, 7)
+      .condition((user, target, move) => user.scene.arena.weather?.weatherType === WeatherType.HAIL)
       .target(MoveTarget.USER_SIDE),
     /* Unused */
     new AttackMove(Moves.SINISTER_ARROW_RAID, "Sinister Arrow Raid (N)", Type.GHOST, MoveCategory.PHYSICAL, 180, -1, 1, -1, "The user, Decidueye, creates countless arrows using its Z-Power and shoots the target with full force.", -1, 0, 7),
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index e566e67dd..cec9e062a 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -352,7 +352,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm {
 
   getName(formIndex?: integer): string {
     if (formIndex !== undefined && this.forms.length) {
-      const form = this.forms[formIndex];
+      const form = this.forms[Math.min(formIndex, this.forms.length - 1)];
       switch (form.formKey) {
         case SpeciesFormKey.MEGA:
         case SpeciesFormKey.ETERNAMAX: