diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp
index d91b2a88d..62874e938 100644
--- a/src/p_pspr.cpp
+++ b/src/p_pspr.cpp
@@ -170,8 +170,11 @@ void P_BringUpWeapon (player_t *player)
 
 	if (player->PendingWeapon == WP_NOCHANGE)
 	{
-		player->psprites[ps_weapon].sy = WEAPONTOP;
-		P_SetPsprite (player, ps_weapon, player->ReadyWeapon->GetReadyState());
+		if (player->ReadyWeapon != NULL)
+		{
+			player->psprites[ps_weapon].sy = WEAPONTOP;
+			P_SetPsprite (player, ps_weapon, player->ReadyWeapon->GetReadyState());
+		}
 		return;
 	}