diff --git a/src/b_bot.c b/src/b_bot.c
index 709a280b5..895c8d18d 100644
--- a/src/b_bot.c
+++ b/src/b_bot.c
@@ -135,7 +135,7 @@ static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cm
 	// ********
 	// FLY MODE
 	// spinmode check
-	if (spinmode)
+	if (spinmode || player->exiting)
 		thinkfly = false;
 	else
 	{
diff --git a/src/p_inter.c b/src/p_inter.c
index d1ea02c80..0ff75b3eb 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -148,15 +148,19 @@ void P_ResetStarposts(void)
 //
 boolean P_CanPickupItem(player_t *player, boolean weapon)
 {
-	if (player->bot && weapon)
+	if (!player->mo || player->mo->health <= 0)
 		return false;
 
+	if (player->bot)
+	{
+		if (weapon)
+			return false;
+		return P_CanPickupItem(&players[consoleplayer], true); // weapon is true to prevent infinite recursion if p1 is bot - doesn't occur in vanilla, but may be relevant for mods
+	}
+
 	if (player->powers[pw_flashing] > (flashingtics/4)*3 && player->powers[pw_flashing] < UINT16_MAX)
 		return false;
 
-	if (player->mo && player->mo->health <= 0)
-		return false;
-
 	return true;
 }