diff --git a/modules/Anomalies/Anomalies.R b/modules/Anomalies/Anomalies.R
index 28092625686e5136f05f7d14e10c7f1f1a62b93a..23014cbdc0604e2568caa3e3b6f9fcc7598f092d 100644
--- a/modules/Anomalies/Anomalies.R
+++ b/modules/Anomalies/Anomalies.R
@@ -89,8 +89,8 @@ compute_anomalies <- function(recipe, data) {
     recipe$Run$output_dir <- paste0(recipe$Run$output_dir,
                                     "/outputs/Anomalies/")
     # Save forecast
-    if (recipe$Analysis$Workflow$Anomalies$save %in% 
-        c('all', 'exp_only', 'fcst_only')) {
+    if ((recipe$Analysis$Workflow$Anomalies$save %in% 
+         c('all', 'exp_only', 'fcst_only')) && !is.null(data$fcst)) {
       save_forecast(recipe = recipe, data_cube = data$fcst, type = 'fcst')
     }
     # Save hindcast
diff --git a/modules/Calibration/Calibration.R b/modules/Calibration/Calibration.R
index dedfbd855c45718fbb81da3892cd466939e20918..6a8fe1039b15ed29507f8e7c17d6d11538221a05 100644
--- a/modules/Calibration/Calibration.R
+++ b/modules/Calibration/Calibration.R
@@ -166,8 +166,8 @@ calibrate_datasets <- function(recipe, data) {
   ## TODO: What do we do with the full values?
   recipe$Run$output_dir <- paste0(recipe$Run$output_dir,
                                   "/outputs/Calibration/")
-  if (recipe$Analysis$Workflow$Calibration$save %in% 
-      c('all', 'exp_only', 'fcst_only')) {
+  if ((recipe$Analysis$Workflow$Calibration$save %in% 
+       c('all', 'exp_only', 'fcst_only')) && (!is.null(data$fcst))) {
     save_forecast(recipe = recipe, data_cube = fcst_calibrated, type = 'fcst')
   }
   if (recipe$Analysis$Workflow$Calibration$save %in%