diff --git a/geau/DESCRIPTION b/geau/DESCRIPTION
index f5e3174b19de938b56a11cfad52f2ec3f27179fc..168cad4451af139d2bbb0b550467066b0bc57794 100644
--- a/geau/DESCRIPTION
+++ b/geau/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: geau
 Title: Utilities very useful to share within geau-inondation team
-Version: 1.0.6.0
+Version: 1.0.6.1
 Authors@R:
     c(
         person(given = "Frédéric",
diff --git a/geau/R/map_so_ii.r b/geau/R/map_so_ii.r
index 66e247c4a8452e50b11b0fefb3e05913f01059d9..d1652837304bc269e06b5893c0ee4b08387a50d3 100644
--- a/geau/R/map_so_ii.r
+++ b/geau/R/map_so_ii.r
@@ -159,6 +159,10 @@ map_so_ii = function(
         if (missing(year)) {
             year = utils::tail(sort(colnames(geau::so_ii_population)), 1)
         }
+        year = match.arg(
+            as.character(year),
+            sort(colnames(geau::so_ii_population))
+        )
         population_palette = scales::colour_ramp(c("white", "red"), alpha = .5)
         color = matrix(
             scales::cscale(
@@ -212,9 +216,13 @@ map_so_ii = function(
         border = NA
         color = NA
         if (!missing(year)) {
+            year = match.arg(
+                as.character(year),
+                dimnames(geau::so_ii_catnat)[["period"]]
+            )
             border = "grey80"
             catnat = apply(
-                geau::so_ii_catnat[, as.character(year), detail, drop = FALSE],
+                geau::so_ii_catnat[, year, detail, drop = FALSE],
                 1:2,
                 sum
             )