--- smsdaemon/ProxyTransceiver.cpp	2008/12/21 22:08:20	211
+++ smsdaemon/ProxyTransceiver.cpp	2008/12/21 22:21:36	212
@@ -7,7 +7,7 @@
 	: _transceiver(realtransceiver), _hasCC(false)
 {
 	Common* cmn = Common::instance();
-	_countrycode = cmn->GetConfigfile()->GetValue("smsdaemon","countrycode").StringValue();
+	_countrycode = cmn->GetConfigfile()->GetValue("smsdaemon","countrycode","").StringValue();
 	if (_countrycode != "")
 	{
 		try
@@ -17,11 +17,15 @@
 				_hasCC = true;
 			}
 		}
-		catch (std::exception&e) 
+		catch (...) 
 		{
 			Logger::logMessage( "Invalid country code:" + _countrycode);
-		}		
+		}
 	}
+	if (_hasCC)
+		Logger::logMessage( "Enforcing country code: " + _countrycode);
+	else
+		Logger::logMessage( "No countrycode enforced");
 }