diff --git a/src/main/java/org/folio/circulation/domain/notice/TemplateContextUtil.java b/src/main/java/org/folio/circulation/domain/notice/TemplateContextUtil.java index 2560f8ae8d..948a695327 100644 --- a/src/main/java/org/folio/circulation/domain/notice/TemplateContextUtil.java +++ b/src/main/java/org/folio/circulation/domain/notice/TemplateContextUtil.java @@ -98,7 +98,7 @@ public static JsonObject createCheckInContext(CheckInContext context) { JsonObject staffSlipContext = createStaffSlipContext(item, firstRequest); JsonObject itemContext = staffSlipContext.getJsonObject(ITEM); - if (item != null && itemContext != null) { + if (ObjectUtils.allNotNull(item, itemContext)) { write(itemContext, "lastCheckedInDateTime", ClockUtil.getZonedDateTime()); if (item.getInTransitDestinationServicePoint() != null) { itemContext.put("toServicePoint", item.getInTransitDestinationServicePoint().getName());