diff --git a/planet/Objects.ocd/Environment.ocd/Cloud.ocd/Lightning.ocd/Script.c b/planet/Objects.ocd/Environment.ocd/Cloud.ocd/Lightning.ocd/Script.c
index 0cabdeec1..01bf0b267 100644
--- a/planet/Objects.ocd/Environment.ocd/Cloud.ocd/Lightning.ocd/Script.c
+++ b/planet/Objects.ocd/Environment.ocd/Cloud.ocd/Lightning.ocd/Script.c
@@ -58,7 +58,7 @@ protected func FxLightningMoveTimer()
 	// Strike objects on the line.
 	for (var obj in FindObjects(Find_OnLine(oldx, oldy, newx, newy), Find_NoContainer(), Find_Layer(GetObjectLayer())))
 	{
-		if (!obj->~LightningStrike(3 + strength / 10))
+		if (obj && !obj->~LightningStrike(3 + strength / 10))
 		{
 			if (GetOCF() & OCF_Alive)
 				Punch(obj, 3 + strength / 10);
diff --git a/planet/Worlds.ocf/GemGrabbers.ocs/Scenario.txt b/planet/Worlds.ocf/GemGrabbers.ocs/Scenario.txt
index c12d6a7ca..63c017485 100644
--- a/planet/Worlds.ocf/GemGrabbers.ocs/Scenario.txt
+++ b/planet/Worlds.ocf/GemGrabbers.ocs/Scenario.txt
@@ -41,5 +41,5 @@ MapHeight=200
 Climate=0
 StartSeason=0
 YearSpeed=0
-Wind=0,0,100,100
+Wind=0,100,-100,100