diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90
index eb94f6ddb..8dab6e8fa 100644
--- a/cicecore/cicedynB/general/ice_init.F90
+++ b/cicecore/cicedynB/general/ice_init.F90
@@ -1342,10 +1342,12 @@ subroutine input_data
 
 ! tcraig, is it really OK for users to run inconsistently?
 ! ech: yes, for testing sensitivities.  It's not recommended for science runs
-      if (ktherm == 1 .and. trim(tfrz_option) /= 'linear_salt') then
+      if (ktherm == 1 .and. (trim(tfrz_option) /= 'linear_salt' .or. &
+                             trim(tfrz_option) /= 'nonlin')) then
          if (my_task == master_task) then
             write(nu_diag,*) subname//' WARNING: ktherm = 1 and tfrz_option = ',trim(tfrz_option)
             write(nu_diag,*) subname//' WARNING:   For consistency, set tfrz_option = linear_salt'
+            write(nu_diag,*) subname//' WARNING:                     or tfrz_option = nonlin'
          endif
       endif
       if (ktherm == 2 .and. trim(tfrz_option) /= 'mushy') then
diff --git a/icepack b/icepack
index 1464efde8..c0d355e3f 160000
--- a/icepack
+++ b/icepack
@@ -1 +1 @@
-Subproject commit 1464efde802a06325478ebb9bcd2cdd0573aad29
+Subproject commit c0d355e3fa9ffca3ae20afa59c0e2fb900c55031