diff --git a/physics/GFS_time_vary_pre.scm.F90 b/physics/GFS_time_vary_pre.scm.F90
index 992cde0af..83e9aaf69 100644
--- a/physics/GFS_time_vary_pre.scm.F90
+++ b/physics/GFS_time_vary_pre.scm.F90
@@ -26,6 +26,10 @@ subroutine GFS_time_vary_pre_init (errmsg, errflg)
          character(len=*),                 intent(out)   :: errmsg
          integer,                          intent(out)   :: errflg
 
+         ! Initialize CCPP error handling variables
+         errmsg = ''
+         errflg = 0
+
          !--- Call gfuncphys (funcphys.f) to compute all physics function tables.
          call gfuncphys ()
 
@@ -47,6 +51,10 @@ subroutine GFS_time_vary_pre_finalize(errmsg, errflg)
 
          ! DH* this is the place to deallocate whatever is allocated by gfuncphys() in GFS_time_vary_pre_init
 
+         ! Initialize CCPP error handling variables
+         errmsg = ''
+         errflg = 0
+
       end subroutine GFS_time_vary_pre_finalize
 
 
diff --git a/physics/moninedmf.f b/physics/moninedmf.f
index fdfef715b..8d3d381a8 100644
--- a/physics/moninedmf.f
+++ b/physics/moninedmf.f
@@ -18,8 +18,8 @@ end subroutine hedmf_finalize
 
 !> \defgroup HEDMF GFS moninedmf Main
 !! @{
-!!  \brief  This subroutine contains all of logic for the 
-!! Hybrid EDMF PBL scheme except for the calculation of 
+!!  \brief  This subroutine contains all of logic for the
+!! Hybrid EDMF PBL scheme except for the calculation of
 !! the updraft properties and mass flux.
 !!
 !> \section arg_table_hedmf_run Argument Table
@@ -270,6 +270,10 @@ subroutine hedmf_run (ix,im,km,ntrac,ntcw,dv,du,tau,rtg,          &
  610      format(1x,' k pr dkt dku ',i5,3f8.2,' l2 ri t2',
      1         ' sr2  ',2f8.2,2e10.2)
 ! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+! Initialize CCPP error handling variables
+      errmsg = ''
+      errflg = 0
+
 !>  ## Compute preliminary variables from input arguments
 
 ! compute preliminary variables