diff --git a/src/SURFEX/modd_pgd_grid.F90 b/src/SURFEX/modd_pgd_grid.F90
index 106a7f63487970c33c1960d6dcce52b5553dfdc4..e9e91a16fee1e32e8ab3ebd7b017ba87b3e56711 100644
--- a/src/SURFEX/modd_pgd_grid.F90
+++ b/src/SURFEX/modd_pgd_grid.F90
@@ -1,6 +1,6 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2003-2019 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
-!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !SFX_LIC for details. version 1.
 !     ##################
       MODULE MODD_PGD_GRID
@@ -17,7 +17,7 @@
 !!    REFERENCE
 !!    ---------
 !!
-!!       
+!!
 !!    AUTHOR
 !!    ------
 !!      V. Masson    *Meteo France*
@@ -25,6 +25,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    10/2003
+!!      P. Wautelet 01/2019: nullify XGRID_PAR at declaration
 !-------------------------------------------------------------------------------
 !
 IMPLICIT NONE
@@ -35,7 +36,7 @@ IMPLICIT NONE
  CHARACTER(LEN=10)           :: CGRID       ! type of grid
 INTEGER                     :: NL          ! number of points of the surface fields
 LOGICAL, DIMENSION(720,360) :: LLATLONMASK ! mask where data are to be read
-REAL, POINTER, DIMENSION(:) :: XGRID_PAR   ! lits of parameters used to define the grid
+REAL, POINTER, DIMENSION(:) :: XGRID_PAR => NULL() ! list of parameters used to define the grid
 INTEGER                     :: NGRID_PAR   ! size of XGRID_PAR
 REAL                        :: XMESHLENGTH ! average mesh length/width (decimal degre)
 !
diff --git a/src/SURFEX/modn_isban.F90 b/src/SURFEX/modn_isban.F90
index 7d7e5643469371159d37757c5be6ce7b04d8054c..2ea5770de36f09326b5d2219eb5302efe3a8cf43 100644
--- a/src/SURFEX/modn_isban.F90
+++ b/src/SURFEX/modn_isban.F90
@@ -1,6 +1,6 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2004-2019 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
-!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !SFX_LIC for details. version 1.
 !##################
 MODULE MODN_ISBA_n
@@ -27,10 +27,11 @@ MODULE MODN_ISBA_n
 !!
 !!    MODIFICATIONS
 !!    -------------
-!!      Original    01/2004                    
+!!      Original    01/2004
 !!      Modified    08/2009 by B. Decharme : LSURF_BUDGETC for all tiles
 !!      Modified by A.L. Gibelin, 04/2009: add carbon spinup
 !!      P. Tulet & M. Leriche 06/2017 : coupling megan online
+!!      P. Wautelet 01/2019: initialize XDROUGHT, XDAILYPAR, XDAILYTEMP, XMODPREC to prevent not initialized errors later on
 !!
 !-------------------------------------------------------------------------------
 !
@@ -38,8 +39,9 @@ MODULE MODN_ISBA_n
 !             ------------
 !
 !
-USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK
-USE PARKIND1  ,ONLY : JPRB
+USE MODD_SURF_PAR, ONLY : XUNDEF
+USE YOMHOOK      , ONLY : LHOOK,   DR_HOOK
+USE PARKIND1     , ONLY : JPRB
 !
 IMPLICIT NONE
 !
@@ -90,10 +92,10 @@ LOGICAL  :: LSURF_VARS
 LOGICAL  :: LCH_BIO_FLUX
 LOGICAL  :: LSOILNOX
 LOGICAL  :: LCH_NO_FLUX
-REAL     :: XDROUGHT 
-REAL     :: XDAILYPAR
-REAL     :: XDAILYTEMP
-REAL     :: XMODPREC
+REAL     :: XDROUGHT = XUNDEF
+REAL     :: XDAILYPAR = XUNDEF
+REAL     :: XDAILYTEMP = XUNDEF
+REAL     :: XMODPREC = XUNDEF
 LOGICAL  :: LGLACIER
 LOGICAL  :: LVEGUPD
 LOGICAL  :: LNITRO_DILU
diff --git a/src/SURFEX/writesurf_pgd_isba_parn.F90 b/src/SURFEX/writesurf_pgd_isba_parn.F90
index 381db556ad47e7faa8e5ad7812fa8d1da9a69782..5b9fa2248459c712aa784d36c00259ec1b9ff934 100644
--- a/src/SURFEX/writesurf_pgd_isba_parn.F90
+++ b/src/SURFEX/writesurf_pgd_isba_parn.F90
@@ -1,6 +1,6 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2003-2019 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
-!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !SFX_LIC for details. version 1.
 !     #########
       SUBROUTINE WRITESURF_PGD_ISBA_PAR_n (HSELECT, DTV, HPROGRAM)
@@ -35,6 +35,7 @@
 !!      Original    01/2003 
 !!      P. Le Moigne 12/2004 : add type of photosynthesis 
 !!      P. Samuelsson 10/2014: MEB
+!!      P. Wautelet 01/2019: bug: write L_STRESS only if it exists
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
@@ -499,6 +500,7 @@ DO JV=1,DTV%NVEGTYPE
   ENDIF
 ENDDO
 !
+IF (ASSOCIATED(DTV%LPAR_STRESS)) THEN
 YRECFM='L_STRESS'
 YCOMMENT=YRECFM
  CALL WRITE_SURF(HSELECT,HPROGRAM,YRECFM,DTV%LDATA_STRESS,IRESP,HCOMMENT=YCOMMENT,HDIR='-')
@@ -513,6 +515,7 @@ DO JV=1,DTV%NVEGTYPE
   ENDIF
 ENDDO
 DEALLOCATE(ZWORK)
+END IF
 !
 YRECFM='L_H_TREE'
 YCOMMENT=YRECFM