From 25a2d5e2ab279778abde6a79045eec99b28330c7 Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Tue, 17 Mar 2020 20:41:38 -0700
Subject: [PATCH] Fix crash in `getPokemon`

---
 src/battle.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/battle.ts b/src/battle.ts
index f82cc78f1..9e173fbb6 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -3017,7 +3017,7 @@ class Battle {
 		return null;
 	}
 	getPokemon(pokemonid: string | undefined) {
-		if (!pokemonid || pokemonid === '??') return null;
+		if (!pokemonid || pokemonid === '??' || pokemonid === 'null') return null;
 		const {siden, slot, pokemonid: parsedPokemonid} = this.parsePokemonId(pokemonid);
 		pokemonid = parsedPokemonid;