Index: trunk/core/units/general/country_states.php
===================================================================
diff -u -N -r1566 -r1926
--- trunk/core/units/general/country_states.php	(.../country_states.php)	(revision 1566)
+++ trunk/core/units/general/country_states.php	(.../country_states.php)	(revision 1926)
@@ -63,7 +63,7 @@
 		 */
 		function CheckState($state_name, $country_code)
 		{
-			if( !$this->CountryHasStates($country_code) ) return '';
+			if( !$this->CountryHasStates($country_code) ) return $state_name;
 			
 			$sql = 'SELECT sdStates.DestAbbr
 					FROM '.TABLE_PREFIX.'StdDestinations AS sdStates
Index: trunk/kernel/units/general/country_states.php
===================================================================
diff -u -N -r1566 -r1926
--- trunk/kernel/units/general/country_states.php	(.../country_states.php)	(revision 1566)
+++ trunk/kernel/units/general/country_states.php	(.../country_states.php)	(revision 1926)
@@ -63,7 +63,7 @@
 		 */
 		function CheckState($state_name, $country_code)
 		{
-			if( !$this->CountryHasStates($country_code) ) return '';
+			if( !$this->CountryHasStates($country_code) ) return $state_name;
 			
 			$sql = 'SELECT sdStates.DestAbbr
 					FROM '.TABLE_PREFIX.'StdDestinations AS sdStates
Index: trunk/core/kernel/utility/formatters.php
===================================================================
diff -u -N -r1831 -r1926
--- trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 1831)
+++ trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 1926)
@@ -151,13 +151,20 @@
 		if ( isset($format) ) $options['format'] = $format;
 		
 		$label = getArrayValue($options['options'], $value);
-		if( getArrayValue($options,'use_phrases') )
+		if( $label !== false )
 		{
-			return $this->Application->Phrase($label);
+			if( getArrayValue($options,'use_phrases') )
+			{
+				return $this->Application->Phrase($label);
+			}
+			else
+			{
+				return $label;
+			}
 		}
 		else
 		{
-			return $label;
+			return $value;
 		}
 	}
 }