Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r28001 -r28094 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28001) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28094) @@ -5777,8 +5777,10 @@ if(ci.getTousseDefinition() == null){ TousseDefinition td = IDOperators.find(tds, ci.getTousseDefinitionID()); ci.setTousseDefinition(td); - ci.setMaterialAmount(td.getMaterialAmount()); - ci.setMaterialSplitAmount(td.getMaterialSplitAmount()); + if(td != null){ + ci.setMaterialAmount(td.getMaterialAmount()); + ci.setMaterialSplitAmount(td.getMaterialSplitAmount()); + } } } }