diff --git a/R/GenericVariable_utils.R b/R/GenericVariable_utils.R
index 00d59ae..7fed6fa 100644
--- a/R/GenericVariable_utils.R
+++ b/R/GenericVariable_utils.R
@@ -13,6 +13,9 @@ check.generic.argument.validity <- function(
     if (missing(data) || is.null(data)) {
       stop(paste(name, "argument is missing."))
     }
+    if (missing(dates)) {
+      stop("Argument 'dates' is missing.")
+    }
     if (length(data) == 0 || length(dates) == 0) {
       stop(paste(name, "and dates must not be empty vectors."))
     }
diff --git a/R/climdexGenericScalar.R b/R/climdexGenericScalar.R
index 339486d..fe0601a 100644
--- a/R/climdexGenericScalar.R
+++ b/R/climdexGenericScalar.R
@@ -49,13 +49,14 @@ climdexGenericScalar.raw <- function(
   namasks <- generate_namasks(filled.list, date.factors, max.missing.days)
   
   return(new("climdexGenericScalar",
-             data = filled.list[["data"]],
-             dates = date.series,
-             date.factors = date.factors,
-             jdays = jdays,
-             namasks = namasks,
-             northern.hemisphere = northern.hemisphere,
-             max.missing.days = max.missing.days))
+    data = filled.list[["data"]],
+    dates = date.series,
+    date.factors = date.factors,
+    jdays = jdays,
+    namasks = namasks,
+    northern.hemisphere = northern.hemisphere,
+    max.missing.days = max.missing.days
+  ))
 }
 
 #' @title climdexGenericScalar.csv