diff --git a/DESCRIPTION b/DESCRIPTION
index 5d94d21df883770a61ba9724b91af486e8be5375..0895ead419ab6c1ba26b2077a3dde857966837a5 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: airGRteaching
 Type: Package
 Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Interface)
-Version: 0.1.8.4
-Date: 2017-10-31
+Version: 0.1.8.5
+Date: 2017-11-21
 Authors@R: c(person("Olivier", "Delaigue", role = c("aut", "cre"), email = "airGR@irstea.fr"), person("Laurent", "Coron", role = c("aut")), person("Pierre", "Brigode", role = c("aut")), person("Guillaume", "Thirel", role = c("ctb")))
 Depends: airGR (>= 1.0.9.43)
 Imports: xts, dygraphs (>= 1.1.1.4), shiny, shinyjs, plotrix, markdown
diff --git a/R/ObsGR.R b/R/ObsGR.R
index 9ea8ad7e4b34adaef1c07d519bacbc4c9e9228cd..522ab99a45b6d0d3ba1499df1ec93d372be0122c 100644
--- a/R/ObsGR.R
+++ b/R/ObsGR.R
@@ -7,8 +7,10 @@ ObsGR <- function(ObsBV = NULL, DatesR = NULL, Precip = NULL, PotEvap = NULL, Qo
     stop("Missing input data")
   }
 
-  if (ncol(ObsBV) >= 5) {
-    TempMean <- ObsBV[, 5L]
+  if (!is.null(ObsBV)) {
+    if (ncol(ObsBV) >= 5) {
+      TempMean <- ObsBV[, 5L]
+    }
   }
   if (!is.null(TempMean)) {
     TempMean <- TempMean