Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
===================================================================
diff -u -r21777 -r21850
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java	(.../ExpensiveGoodsAction.java)	(revision 21777)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java	(.../ExpensiveGoodsAction.java)	(revision 21850)
@@ -13,7 +13,6 @@
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-import net.sf.json.JsonConfig;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -26,7 +25,6 @@
 import com.forgon.disinfectsystem.basedatamanager.supplier.service.RegistrationCertificationManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods;
-import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntryItem;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsStock;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.ExpensiveGoodsSupplier;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.RegistrationCertification;
@@ -286,7 +284,9 @@
 		if(registrationCertification != null){
 			expensiveGoodsSupplier = registrationCertification.getExpensiveGoodsSupplier();
 			expensiveGoodsObj.put("registrationCertification", registrationCertification.getCertification());
-			expensiveGoodsObj.put("expensiveGoodsSupplier",expensiveGoodsSupplier.getCompanyName());
+			if(expensiveGoodsSupplier != null){
+				expensiveGoodsObj.put("expensiveGoodsSupplier",expensiveGoodsSupplier.getCompanyName());
+			}
 		}
 		JSONObject map = new JSONObject();
 		map.put("success", true);