diff --git a/modules/servodyn/src/StrucCtrl.f90 b/modules/servodyn/src/StrucCtrl.f90
index 0ffc852e5..0ad9e4ded 100644
--- a/modules/servodyn/src/StrucCtrl.f90
+++ b/modules/servodyn/src/StrucCtrl.f90
@@ -2338,18 +2338,20 @@ subroutine    StC_ValidatePrimaryData( InputFileData, InitInp, ErrStat, ErrMsg )
       enddo
    endif
 
-   IF ( InputFileData%StC_SA_MODE /= SA_CMODE_GH_vel    .and. &
-        InputFileData%StC_SA_MODE /= SA_CMODE_GH_invVel .and. &
-        InputFileData%StC_SA_MODE /= SA_CMODE_GH_disp   .and. &
-        InputFileData%StC_SA_MODE /= SA_CMODE_Ph_FF     .and. &
-        InputFileData%StC_SA_MODE /= SA_CMODE_Ph_DF     ) then
-      CALL SetErrStat( ErrID_Fatal, 'Semi-active control mode (StC_SA_MODE) must be '                          //&
-                   trim(Num2LStr(SA_CMODE_GH_vel))   //' (velocity-based ground hook control), '               //&
-                   trim(Num2LStr(SA_CMODE_GH_invVel))//' (inverse velocity-based ground hook control), '       //&
-                   trim(Num2LStr(SA_CMODE_GH_disp))  //' (displacement-based ground hook control), '           //&
-                   trim(Num2LStr(SA_CMODE_Ph_FF))    //' (phase difference algorithm with friction force), or '//&
-                   trim(Num2LStr(SA_CMODE_Ph_DF))    //' (phase difference algorithm with damping force).',      &
-           ErrStat, ErrMsg, RoutineName )
+   IF ( InputFileData%StC_CMODE == CMODE_Semi ) THEN
+      IF ( InputFileData%StC_SA_MODE /= SA_CMODE_GH_vel    .and. &
+           InputFileData%StC_SA_MODE /= SA_CMODE_GH_invVel .and. &
+           InputFileData%StC_SA_MODE /= SA_CMODE_GH_disp   .and. &
+           InputFileData%StC_SA_MODE /= SA_CMODE_Ph_FF     .and. &
+           InputFileData%StC_SA_MODE /= SA_CMODE_Ph_DF     ) then
+         CALL SetErrStat( ErrID_Fatal, 'Semi-active control mode (StC_SA_MODE) must be '                          //&
+                      trim(Num2LStr(SA_CMODE_GH_vel))   //' (velocity-based ground hook control), '               //&
+                      trim(Num2LStr(SA_CMODE_GH_invVel))//' (inverse velocity-based ground hook control), '       //&
+                      trim(Num2LStr(SA_CMODE_GH_disp))  //' (displacement-based ground hook control), '           //&
+                      trim(Num2LStr(SA_CMODE_Ph_FF))    //' (phase difference algorithm with friction force), or '//&
+                      trim(Num2LStr(SA_CMODE_Ph_DF))    //' (phase difference algorithm with damping force).',      &
+              ErrStat, ErrMsg, RoutineName )
+      END IF
    END IF
 
       ! Prescribed forces
diff --git a/reg_tests/r-test b/reg_tests/r-test
index ff9b57711..2d6b75bf7 160000
--- a/reg_tests/r-test
+++ b/reg_tests/r-test
@@ -1 +1 @@
-Subproject commit ff9b577119f5d056168d711b291d0156ee033955
+Subproject commit 2d6b75bf7ffeeaf181a22199c86cbb6ba1a3e15f