diff --git a/src/main/java/de/ph87/homeautomation/schedule/ScheduleExecutionService.java b/src/main/java/de/ph87/homeautomation/schedule/ScheduleExecutionService.java
index 07cb278..c2c7c81 100644
--- a/src/main/java/de/ph87/homeautomation/schedule/ScheduleExecutionService.java
+++ b/src/main/java/de/ph87/homeautomation/schedule/ScheduleExecutionService.java
@@ -38,15 +38,17 @@ public class ScheduleExecutionService {
   }
 
   private void executeEntry(final Schedule schedule, final ScheduleEntry entry, final ZonedDateTime now) {
-    if (entry.getProperty() == null) {
-      log.error("Cannot execute Schedule {}: No property set!", schedule);
-      return;
-    }
-    entry.setLastClearTimestamp(entry.getNextClearTimestamp());
     log.info("Executing Schedule \"{}\" Entry {}", schedule.getTitle(), entry);
-    propertyWriteService.writeToChannel(entry.getProperty(), entry.getValue());
-    bulkExecutor.execute(entry.getBulk());
+    entry.setLastClearTimestamp(entry.getNextClearTimestamp());
     scheduleCalculationService.calculateSchedule(schedule, now);
+    if (entry.getProperty() != null) {
+      log.debug("Schedule setting property: {} = {}", entry.getProperty().getTitle(), entry.getValue());
+      propertyWriteService.writeToChannel(entry.getProperty(), entry.getValue());
+    }
+    if (entry.getBulk() != null) {
+      log.debug("Schedule executing Bulk: {}", entry.getBulk());
+      bulkExecutor.execute(entry.getBulk());
+    }
   }
 
 }