diff --git a/DESCRIPTION b/DESCRIPTION
index 3f756371fc2713eba320768bda8559014cbd4761..4fbef5640c6d002390e3c829dbde82325d0c62b0 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.0.12.4
+Version: 1.0.12.5
 Date: 2018-08-29
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.rmd b/NEWS.rmd
index f6603dfef01f3ab080cab4d04a0748a54d4ade64..eec23539edf7930ecb6dbef096f62601e535b2dc 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
 
 
 
-### 1.0.12.4 Release Notes (2018-08-29) 
+### 5 Release Notes (2018-08-29) 
 
 
 #### Deprectated and defunct
@@ -26,7 +26,9 @@ output:
 
 - <code>PEdaily_Oudin()</code> now presents a <code>LatUnit</code> argument which allows to chose the unit of the latitude between radians and degrees.
 
-- <code>Calibration_Michel()</code> is now faster during the grid-screening step when a parameter is set using <code>FixedParam</code> in <code>CreateCalibOptions</code>.
+- <code>Calibration_Michel()</code> is now faster during the grid-screening step when a parameter is set using <code>FixedParam</code> in <code>CreateCalibOptions()</code>.
+
+- <code>CreateCalibOptions()</code> now returns an error when all the parameters ar set in <code>FixedParam</code>.
 
 
 #### Minor user-visible changes
diff --git a/R/CreateCalibOptions.R b/R/CreateCalibOptions.R
index a0c20e6589186a331692485682efe4e958e3eb27..149e5ba4cb57af44d6a3c63e30a0e9b85a969e7f 100644
--- a/R/CreateCalibOptions.R
+++ b/R/CreateCalibOptions.R
@@ -178,6 +178,10 @@ CreateCalibOptions <-
         stop("Incompatibility between FixedParam length and FUN_MOD \n")
         return(NULL)
       }
+      if (!all(is.na(FixedParam))) {
+        stop("At least one parameter must be not set (NA) \n")
+        return(NULL)
+      }
     }
     
     ##check_SearchRanges