From e1c2657b115f61420dd3a9b7be9630e8cd0cd3f3 Mon Sep 17 00:00:00 2001
From: Derision <DerisionEQ@gmail.com>
Date: Fri, 3 May 2013 09:36:16 +0100
Subject: [PATCH] NULL check in Merc::CalcItemBonuses

---
 zone/merc.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zone/merc.cpp b/zone/merc.cpp
index ba9e5d66f..04df278a3 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -275,7 +275,8 @@ void Merc::CalcItemBonuses(StatBonuses* newbon) {
 		if(equipment[i] == 0)
 			continue;
 		const Item_Struct * itm = database.GetItem(equipment[i]);
-		AddItemBonuses(itm, newbon);
+		if(itm)
+			AddItemBonuses(itm, newbon);
 	}
 
 	//Power Source Slot