diff --git a/modules/hydrodyn/src/HydroDyn_Output.f90 b/modules/hydrodyn/src/HydroDyn_Output.f90
index b78008824f..a4456740d4 100644
--- a/modules/hydrodyn/src/HydroDyn_Output.f90
+++ b/modules/hydrodyn/src/HydroDyn_Output.f90
@@ -1163,7 +1163,7 @@ SUBROUTINE HDOUT_Init( HydroDyn_ProgDesc, OutRootName, InputFileData, y,  p, m,
       
    
    CALL HDOUT_ChkOutLst( InputFileData%OutList(1:p%NumOuts), y, p, ErrStat, ErrMsg )
-   IF ( ErrStat /= 0 ) RETURN
+   IF ( ErrStat >= ErrID_Fatal ) RETURN
 
          ! Aggregate the sub-module initialization outputs for the glue code
 
diff --git a/modules/seastate/src/SeaState_Output.f90 b/modules/seastate/src/SeaState_Output.f90
index c9631b3f9a..2ae2576f96 100644
--- a/modules/seastate/src/SeaState_Output.f90
+++ b/modules/seastate/src/SeaState_Output.f90
@@ -745,57 +745,57 @@ SUBROUTINE SeaStOut_Init( SeaSt_ProgDesc, OutRootName, InputFileData, y,  p, m,
       
    
    CALL SeaStOUT_ChkOutLst( InputFileData%OutList(1:p%NumOuts), y, p, ErrStat, ErrMsg )
-   IF ( ErrStat /= 0 ) RETURN
+   IF ( ErrStat >= ErrID_Fatal ) RETURN
 
-         ! Aggregate the sub-module initialization outputs for the glue code
+   ! Aggregate the sub-module initialization outputs for the glue code
 
-         p%NumTotalOuts = p%NumOuts
-         m%LastOutTime  = 0.0_DbKi
-         m%Decimate     = 0
-         p%OutDec       = 1             !TODO: Remove this once the parameter has been added to the HD input file GJH 7/8/2014
+   p%NumTotalOuts = p%NumOuts
+   m%LastOutTime  = 0.0_DbKi
+   m%Decimate     = 0
+   p%OutDec       = 1             !TODO: Remove this once the parameter has been added to the HD input file GJH 7/8/2014
 
+   
+      ! Allocate the aggregate arrays
+   
+   ALLOCATE ( InitOut%WriteOutputHdr ( p%NumTotalOuts ) , STAT=ErrStat )
+   IF ( ErrStat /= 0 )  THEN
+      ErrMsg  = ' Error allocating memory for the WriteOutputHdr array.'
+      ErrStat = ErrID_Fatal
+      RETURN
+   END IF
+   
+   ALLOCATE ( InitOut%WriteOutputUnt ( p%NumTotalOuts ) , STAT=ErrStat )
+   IF ( ErrStat /= 0 )  THEN
+      ErrMsg  = ' Error allocating memory for the WriteOutputUnt array.'
+      ErrStat = ErrID_Fatal
+      RETURN
+   END IF
+   
+   ALLOCATE ( y%WriteOutput         ( p%NumTotalOuts ) , STAT=ErrStat )
+   IF ( ErrStat /= 0 )  THEN
+      ErrMsg  = ' Error allocating memory for the WriteOutput array.'
+      ErrStat = ErrID_Fatal
+      RETURN
+   END IF
+   y%WriteOutput = 0.0_ReKi  ! bjj added this only so the Intel Inspector wouldn't complain about uninitialized memory access (was harmless)
+   
+            
+      ! Initialize the HD-level Hdr and Unt elements
+   DO I = 1,p%NumOuts
+   
+      InitOut%WriteOutputHdr(I) = TRIM( p%OutParam(I)%Name  )
+      InitOut%WriteOutputUnt(I) = TRIM( p%OutParam(I)%Units )      
+   
+   END DO    
       
-            ! Allocate the aggregate arrays
-         
-         ALLOCATE ( InitOut%WriteOutputHdr ( p%NumTotalOuts ) , STAT=ErrStat )
-         IF ( ErrStat /= 0 )  THEN
-            ErrMsg  = ' Error allocating memory for the WriteOutputHdr array.'
-            ErrStat = ErrID_Fatal
-            RETURN
-         END IF
-         
-         ALLOCATE ( InitOut%WriteOutputUnt ( p%NumTotalOuts ) , STAT=ErrStat )
-         IF ( ErrStat /= 0 )  THEN
-            ErrMsg  = ' Error allocating memory for the WriteOutputUnt array.'
-            ErrStat = ErrID_Fatal
-            RETURN
-         END IF
-         
-         ALLOCATE ( y%WriteOutput         ( p%NumTotalOuts ) , STAT=ErrStat )
-         IF ( ErrStat /= 0 )  THEN
-            ErrMsg  = ' Error allocating memory for the WriteOutput array.'
-            ErrStat = ErrID_Fatal
-            RETURN
-         END IF
-         y%WriteOutput = 0.0_ReKi  ! bjj added this only so the Intel Inspector wouldn't complain about uninitialized memory access (was harmless)
-         
-                  
-            ! Initialize the HD-level Hdr and Unt elements
-         DO I = 1,p%NumOuts
-         
-            InitOut%WriteOutputHdr(I) = TRIM( p%OutParam(I)%Name  )
-            InitOut%WriteOutputUnt(I) = TRIM( p%OutParam(I)%Units )      
       
-         END DO    
-            
-            
-         J = p%NumOuts + 1
+   J = p%NumOuts + 1
       
 
-      IF ( p%OutSwtch == 1 .OR. p%OutSwtch == 3 ) THEN
-         CALL SeaStOut_OpenOutput( SeaSt_ProgDesc, OutRootName, p, InitOut, ErrStat, ErrMsg )
-         IF (ErrStat >= AbortErrLev ) RETURN
-      END IF
+   IF ( p%OutSwtch == 1 .OR. p%OutSwtch == 3 ) THEN
+      CALL SeaStOut_OpenOutput( SeaSt_ProgDesc, OutRootName, p, InitOut, ErrStat, ErrMsg )
+      IF (ErrStat >= AbortErrLev ) RETURN
+   END IF