diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index b810e8d57..2dcb969b5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -6164,7 +6164,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid JSONObject result = null; JSONObject expireInfo = clientContractService.getClientContractExpire(client_id, channel); JSONObject account = clientAccountMapper.findById(account_id); - if (PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER) { + if (account == null || PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER) { return result; } else { if (expireInfo.getBooleanValue("alert")) {