diff --git a/src/g_shared/a_weapons.cpp b/src/g_shared/a_weapons.cpp
index e2aaab1c4..ecfa75d0d 100644
--- a/src/g_shared/a_weapons.cpp
+++ b/src/g_shared/a_weapons.cpp
@@ -757,6 +757,10 @@ AWeapon *FWeaponSlot::PickWeapon(player_t *player, bool checkammo)
 {
 	int i, j;
 
+	if (player->mo == NULL)
+	{
+		return NULL;
+	}
 	// Does this slot even have any weapons?
 	if (Weapons.Size() == 0)
 	{