diff --git a/src/d_items.c b/src/d_items.c
index cfcfbcfb..d0c9f85d 100644
--- a/src/d_items.c
+++ b/src/d_items.c
@@ -32,7 +32,7 @@
 //  atkstate, i.e. attack/fire/hit frame
 //  flashstate, muzzle flash
 //
-weaponinfo_t    weaponinfo[NUMWEAPONS+1] =
+weaponinfo_t    weaponinfo[NUMWEAPONS+2] =
 {
   {
     // fist
@@ -145,6 +145,9 @@ weaponinfo_t    weaponinfo[NUMWEAPONS+1] =
   {
     0
   },
+  {
+    0
+  },
 };
 
 //----------------------------------------------------------------------------
diff --git a/src/d_items.h b/src/d_items.h
index 94215f68..20e8abb3 100644
--- a/src/d_items.h
+++ b/src/d_items.h
@@ -59,7 +59,7 @@ typedef struct
   int         flags;
 } weaponinfo_t;
 
-extern  weaponinfo_t    weaponinfo[NUMWEAPONS+1];
+extern  weaponinfo_t    weaponinfo[NUMWEAPONS+2];
 
 #endif
 
diff --git a/src/p_pspr.c b/src/p_pspr.c
index d5fe0636..16442880 100644
--- a/src/p_pspr.c
+++ b/src/p_pspr.c
@@ -159,7 +159,6 @@ static void P_BringUpWeapon(player_t *player)
 
   if (player->pendingweapon >= NUMWEAPONS)
   {
-    player->pendingweapon = NUMWEAPONS;
     I_Printf(VB_WARNING, "P_BringUpWeapon: weaponinfo overrun has occurred.");
   }