diff --git a/src/p_inter.c b/src/p_inter.c
index 5a816d52f..83eb50777 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2158,7 +2158,8 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 
 		if (player->exiting)
 		{
-			K_DoInstashield(player);
+			if (inflictor)
+				K_DoInstashield(player);
 			return false;
 		}
 
diff --git a/src/p_user.c b/src/p_user.c
index 886692000..f10090f11 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1364,7 +1364,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean fromAir)
 
 	clipmomz = !(P_CheckDeathPitCollide(player->mo));
 
-	if (player->prevonground == false && fromAir == true && clipmomz == true)
+	if (player->airtime > 10 && player->prevonground == false && fromAir == true && clipmomz == true)
 	{
 		K_SpawnSplashForMobj(player->mo, abs(player->mo->momz));
 	}