diff --git a/omod/src/main/java/org/openmrs/module/ipd/service/impl/IPDScheduleServiceImpl.java b/omod/src/main/java/org/openmrs/module/ipd/service/impl/IPDScheduleServiceImpl.java
index ecca043..8138fb0 100644
--- a/omod/src/main/java/org/openmrs/module/ipd/service/impl/IPDScheduleServiceImpl.java
+++ b/omod/src/main/java/org/openmrs/module/ipd/service/impl/IPDScheduleServiceImpl.java
@@ -155,12 +155,12 @@ public List<PatientMedicationSummary> getSlotsForPatientListByTime(List<String>
         List<Slot> slots = slotService.getSlotsForPatientListByTime(patientUuidList, localStartDate, localEndDate);
 
         List<Slot> previousSlots = null;
-        if (includePreviousSlot == true) {
+        if (includePreviousSlot != null && includePreviousSlot == true) {
             previousSlots = slotService.getImmediatePreviousSlotsForPatientListByTime(patientUuidList, localStartDate);
         }
 
         List<Object[]> slotsDuration = null;
-        if (includeSlotDuration == true) {
+        if (includeSlotDuration !=null && includeSlotDuration == true) {
             List<Order> orders = slots.stream()
                     .map(Slot::getOrder)
                     .filter(order -> order != null)