if !is_org_in_free_trial_period(&trigger.org).await? {
     log::info!(
         "[Scheduler trace_id {scheduler_trace_id}] Skipping pipeline {} id {} in org {} because free trial expiry",
         pipeline.name,
         pipeline_id,
         trigger.org
     );
-    new_trigger.next_run_at += Duration::try_days(7).unwrap().num_microseconds().unwrap();
+    if let Some(days) = Duration::try_days(7) {
+        if let Some(delta) = days.num_microseconds() {
+            new_trigger.next_run_at = new_trigger.next_run_at.saturating_add(delta);
+        } else {
+            log::warn!("[SCHEDULER trace_id {scheduler_trace_id}] Failed to convert 7 days to microseconds; leaving next_run_at unchanged");
+        }
+    } else {
+        log::warn!("[SCHEDULER trace_id {scheduler_trace_id}] Failed to create 7-day duration; leaving next_run_at unchanged");
+    }
     db::scheduler::update_trigger(new_trigger).await?;
     return Ok(());
 }

 let aligned_supposed_to_be_run_at = if !is_cron_frequency {
+    let period_secs = derived_stream
+        .trigger_condition
+        .period
+        .checked_mul(60)
+        .unwrap_or_else(|| {
+            log::warn!("[SCHEDULER trace_id {scheduler_trace_id}] period overflow when converting minutes to seconds; capping to i32::MAX");
+            i32::MAX
+        });
     TriggerCondition::align_time(
         supposed_to_be_run_at,
         derived_stream.tz_offset,
-        Some(derived_stream.trigger_condition.period * 60),
+        Some(period_secs),
     )
 } else {
     // For cron frequency, we don't need to align the end time as it is already aligned (the
     // cron crate takes care of it)
     TriggerCondition::align_time(supposed_to_be_run_at, derived_stream.tz_offset, None)
 };

 if start.is_none_or(|t0| t0 < aligned_end_time) {
     end = aligned_end_time;
 } else {
-    // either t0 = aligned_end_time or t0 > aligned_end_time
-    // in both cases, we need to skip to next run because, we should always use
-    // aligned_curr_time as the end time
-    // Invalid timerange, most probably due to non-zero delay
-    // Don't do any further processing, just skip to next run
     let start_time = start.unwrap();
+    let intended_end = aligned_end_time;
     log::warn!(
         "[SCHEDULER trace_id {scheduler_trace_id}] module key: {}, Invalid timerange. Skipping to next run. start: {}, end: {}",
         new_trigger.module_key,
         start_time,
-        end,
+        intended_end,
     );
     new_trigger.next_run_at = derived_stream.trigger_condition.get_next_trigger_time(
         false,
         derived_stream.tz_offset,
         false,
         None,
     )?;
     trigger_data_stream.status = TriggerDataStatus::Skipped;
-    trigger_data_stream.end_time = aligned_end_time;
+    trigger_data_stream.end_time = intended_end;
     trigger_data_stream.next_run_at = new_trigger.next_run_at;
     trigger_data_stream.start_time = start_time;
     trigger_data_stream.error = Some(format!(
         "Invalid timerange - start: {}, end: {}, should be fixed in the next run",
-        start_time, end,
+        start_time, intended_end,
     ));
     db::scheduler::update_trigger(new_trigger).await?;
     publish_triggers_usage(trigger_data_stream).await;
     return Ok(());
 }