diff --git a/omod/src/main/java/org/openmrs/module/kenyaemr/web/controller/KenyaemrCoreRestController.java b/omod/src/main/java/org/openmrs/module/kenyaemr/web/controller/KenyaemrCoreRestController.java
index f32054c94..a4b45a39d 100644
--- a/omod/src/main/java/org/openmrs/module/kenyaemr/web/controller/KenyaemrCoreRestController.java
+++ b/omod/src/main/java/org/openmrs/module/kenyaemr/web/controller/KenyaemrCoreRestController.java
@@ -2556,12 +2556,11 @@ public Object getPatientSummary(@RequestParam("patientUuid") String patientUuid)
         // All CD4 Count
         CalculationResult allCd4CountResults = EmrCalculationUtils.evaluateForPatient(AllCd4CountCalculation.class,
                 null, patient);
-        System.out.println(
-                "allCd4CountResults============================================================================================================"
-                        + allCd4CountResults);
-        patientSummary.put("allCd4CountResults",
-                !allCd4CountResults.isEmpty() && allCd4CountResults.getValue() != null ? allCd4CountResults.getValue()
-                        : "");
+                if (allCd4CountResults != null && allCd4CountResults.getValue() != null) {
+                    patientSummary.put("allCd4CountResults", allCd4CountResults.getValue());
+                } else {
+                    patientSummary.put("allCd4CountResults", "");
+                }
 
         return patientSummary;