Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r13351 -r13382
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 13351)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 13382)
@@ -2498,8 +2498,10 @@
 				Map<MaterialDefinition, Integer> materialMap = new HashMap<MaterialDefinition, Integer>();
 				for (MaterialInstance mi : ms) {
 					MaterialDefinition md = mi.getMaterialDefinition();
-					if(md.getIntoBasketMaxAmount() != null && md.getIntoBasketMaxAmount() > 0){
-						materialMap.put(md, mi.getCount());
+					if(md != null){
+						if(md.getIntoBasketMaxAmount() != null && md.getIntoBasketMaxAmount() > 0){
+							materialMap.put(md, mi.getCount());
+						}
 					}
 				}
 				for (int j = 0; j < waitLoadAmount; j++) {