diff --git a/src/main/java/com/kms/service/PaymentService.java b/src/main/java/com/kms/service/PaymentService.java
index 0b46424d1a8cc821c71b5c80e180cd9dd52f6425..6d9e8370ffbb66f1aaed8c4c4bbee11cfd5af840 100644
--- a/src/main/java/com/kms/service/PaymentService.java
+++ b/src/main/java/com/kms/service/PaymentService.java
@@ -13,6 +13,7 @@ import javax.jws.WebService;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @WebService
@@ -72,13 +73,13 @@ public class PaymentService {
     @WebMethod
     public PaymentStatusBatchResp checkPaymentStatusBatch(@WebParam(name = "paymentIds") List<Integer> paymentIds) {
         List<Payment> payments = paymentIds.stream().map(paymentId -> {
-            try {
-                return paymentDao.queryForId(paymentId);
-            } catch (SQLException e) {
-                return null;
-            }
-        }).collect(Collectors.toList());
-
+                    try {
+                        return paymentDao.queryForId(paymentId);
+                    } catch (SQLException e) {
+                        return null;
+                    }
+                }).filter(Objects::nonNull)
+                .collect(Collectors.toList());
         if (payments.isEmpty()) {
             return new PaymentStatusBatchResp("Payment ids not found or unexpected error has happened", null);
         }