From 260dcb0f2fefcc80b5feb16b5f022a168fbde48b Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Sun, 25 Aug 2019 05:37:14 -0400
Subject: [PATCH] Add better error message for spread move crash

---
 src/battle.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/battle.ts b/src/battle.ts
index dcbbaf3e7..c7a57ae3d 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -1395,7 +1395,12 @@ class Battle {
 			targets.push(target.side.missedPokemon);
 		} else {
 			for (const hitTarget of kwArgs.spread.split(',')) {
-				targets.push(this.getPokemon(hitTarget + ': ?')!);
+				const target = this.getPokemon(hitTarget + ': ?');
+				if (!target) {
+					this.log(['error', `Invalid spread move target: "${hitTarget}"`]);
+					continue;
+				}
+				targets.push(target);
 			}
 		}