Index: /home/dave/public_html/pw/sites/all/modules/cck_address/cck_address.module
===================================================================
--- /home/dave/public_html/pw/sites/all/modules/cck_address/cck_address.module  (revision 885)
+++ /home/dave/public_html/pw/sites/all/modules/cck_address/cck_address.module  (working copy)
@@ -298,6 +298,9 @@
       if (($field['other_countries'] == 0) && ($field['state_abbrv'] == 2)) {
         form_set_error('other_countries', t('"Allow <em>other</em> countries?" must be checked if you are using <em>Free-text entry</em> for states.'));
       }
+      if (($field['other_countries'] == 1) && ($field['state_abbrv'] != 2)) {
+        form_set_error('state_abbrv', t('You must use "<em>Free text entry</em>" for states if you "Allow <em>other</em> countries".'));
+      }
       if (isset($field['multiple'])) {
         unset ($field['multiple']);
       }