Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r14021 -r14043 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14021) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14043) @@ -78,6 +78,7 @@ import com.forgon.tools.MathTools; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; +import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JsonPropertyFilter; import com.google.common.reflect.TypeToken; @@ -1453,12 +1454,13 @@ page); } else if (ImageFile.IMAGE_TYPE_MATERIAL.equals(imageType)) { - MaterialDefinition material = materialDefinitionManager - .getMaterialDefinitionById(materialId); + if(DatabaseUtil.isPoIdValid(materialId)){ + MaterialDefinition material = materialDefinitionManager + .getMaterialDefinitionById(materialId); - img = imageFileManager.getImageByIdAndType(material.getId(), - ImageFile.IMAGE_TYPE_MATERIAL, page); - + img = imageFileManager.getImageByIdAndType(material.getId(), + ImageFile.IMAGE_TYPE_MATERIAL, page); + } } OutputStream outputStream = null;