diff --git a/scripts/exgfs_atmos_nceppost.sh b/scripts/exgfs_atmos_nceppost.sh
index 278a2c1e1..0e6d1f719 100755
--- a/scripts/exgfs_atmos_nceppost.sh
+++ b/scripts/exgfs_atmos_nceppost.sh
@@ -26,6 +26,8 @@ echo "                 and reading sigio model outputs."
 echo " Aug 20 - Meng - Remove .ecf extentsion per EE2 review."
 echo " Sep 20 - Meng - Update clean up files per EE2 review."
 echo " Dec 20 - Meng - Add alert for special data file."
+echo " Jun 21 - Mao  - Instead of err_chk, catch err and print out"
+echo "                 WAFS failure warnings to avoid job crashing"
 echo "-----------------------------------------------------"
 #####################################################################
 
diff --git a/scripts/exglobal_atmos_pmgr.sh b/scripts/exglobal_atmos_pmgr.sh
index 0588adadc..a9bcb4251 100755
--- a/scripts/exglobal_atmos_pmgr.sh
+++ b/scripts/exglobal_atmos_pmgr.sh
@@ -49,17 +49,13 @@ do
     then
       if [ $fhr -eq 0 ]
       then 
-        if [ -s ${COMIN}/${RUN}.${cycle}.loganl.txt ]
-        then
-          ecflow_client --event release_postanl
-          ecflow_client --event release_post000
-          postjobs=`echo $postjobs | sed "s/00//"`
-        fi
-      else    
-        ecflow_client --event release_post${fhr3}
-        # Remove current fhr from list
-        postjobs=`echo $postjobs | sed "s/${fhr}//"`
-      fi
+####        ecflow_client --event release_${RUN}_postanl
+        ecflow_client --event release_postanl
+      fi    
+####      ecflow_client --event release_${RUN}_post${fhr}
+      ecflow_client --event release_post${fhr3}
+      # Remove current fhr from list
+      postjobs=`echo $postjobs | sed "s/${fhr}//"`
     fi
   done
   
diff --git a/ush/gfs_nceppost.sh b/ush/gfs_nceppost.sh
index 885c56b68..c5fc47308 100755
--- a/ush/gfs_nceppost.sh
+++ b/ush/gfs_nceppost.sh
@@ -23,6 +23,8 @@
 #                  Remove legacy setting for reading non-nemsio model output
 #                  and generating grib1 data
 # 2019-06-02  Wen Meng: Remove the links of gfs fix files. 
+# 2021-06-11  Yali Mao: Instead of err_chk, 'exit $err' for wafsfile 
+#                  if POSTGPEXEC fails
 #
 # Usage:  global_postgp.sh SIGINP FLXINP FLXIOUT PGBOUT PGIOUT IGEN
 #