diff --git a/battles.js b/battles.js
index c458a1a863..78dabe453b 100644
--- a/battles.js
+++ b/battles.js
@@ -1353,7 +1353,9 @@ function Battle(roomid, format, rated) {
 			return Math.random()-0.5;
 		});
 		for (var i=0; i<actives.length; i++) {
-			if (actives[i].isStarted) selfB.runEvent(eventid, actives[i], null, effect, relayVar);
+			if (actives[i].isStarted) {
+				selfB.runEvent(eventid, actives[i], null, effect, relayVar);
+			}
 		}
 	};
 	this.residualEvent = function(eventid, relayVar) {
diff --git a/data/scripts.js b/data/scripts.js
index e5deb8501e..cd6ec3294c 100644
--- a/data/scripts.js
+++ b/data/scripts.js
@@ -138,6 +138,7 @@ exports.BattleScripts = {
 				}
 				return true;
 			}
+			if (!pokemon.hp) pokemon.faint();
 		} else {
 			if (target.fainted && target.side !== pokemon.side) {
 				// if a targeted foe faints, the move is retargeted