diff --git a/src/data/ability.ts b/src/data/ability.ts
index 04cd18adac8..f2220c850dc 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -3305,7 +3305,7 @@ export function initAbilities() {
     new Ability(Abilities.EMERGENCY_EXIT, 7)
       .unimplemented(),
     new Ability(Abilities.WATER_COMPACTION, 7)
-      .attr(PostDefendStatChangeAbAttr, (target, user, move) => move.type === Type.WATER, BattleStat.DEF, 2),
+      .attr(PostDefendStatChangeAbAttr, (target, user, move) => move.type === Type.WATER && move.category !== MoveCategory.STATUS, BattleStat.DEF, 2),
     new Ability(Abilities.MERCILESS, 7)
       .unimplemented(),
     new Ability(Abilities.SHIELDS_DOWN, 7)
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 30cc7c96dfb..2be2ee15593 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -418,7 +418,7 @@ export class GameData {
           .then(response => response.text())
           .then(response => {
             if (!response.length || response[0] !== '{') {
-              if (response.startsWith('failed to open save file')) {
+              if (response.startsWith('sql: no rows in result set')) {
                 this.scene.queueMessage('Save data could not be found. If this is a new account, you can safely ignore this message.', null, true);
                 return resolve(true);
               } else if (response.indexOf('Too many connections') > -1) {