diff --git a/src/game.cpp b/src/game.cpp
index 609ca1a1a..c2ee7f311 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2581,10 +2581,8 @@ void the_game(bool &kill, bool random_input, InputHandler *input,
 		ItemStack playeritem;
 		{
 			InventoryList *mlist = local_inventory.getList("main");
-			if(mlist != NULL)
-			{
+			if((mlist != NULL) && (client.getPlayerItem() < mlist->getSize()))
 				playeritem = mlist->getItem(client.getPlayerItem());
-			}
 		}
 		const ItemDefinition &playeritem_def =
 				playeritem.getDefinition(itemdef);
@@ -3332,7 +3330,7 @@ void the_game(bool &kill, bool random_input, InputHandler *input,
 			// Update wielded tool
 			InventoryList *mlist = local_inventory.getList("main");
 			ItemStack item;
-			if(mlist != NULL)
+			if((mlist != NULL) && (client.getPlayerItem() < mlist->getSize()))
 				item = mlist->getItem(client.getPlayerItem());
 			camera.wield(item, client.getPlayerItem());
 		}