diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 8a88e61a393..0a67d7c696c 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -270,7 +270,8 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
 
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("State").'</td><td>';
-	$pays_code=getCountry($conf->global->MAIN_INFO_SOCIETE_PAYS,2);
+	$pays_code='';
+	if ($conf->global->MAIN_INFO_SOCIETE_PAYS) $pays_code=getCountry($conf->global->MAIN_INFO_SOCIETE_PAYS,2);
 	$formcompany->select_departement($conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT,$pays_code,'departement_id');
 	print '</td></tr>'."\n";
 
@@ -601,7 +602,7 @@ else
 
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCountry").'</td><td>';
-	print getCountry($conf->global->MAIN_INFO_SOCIETE_PAYS,1);
+	if ($conf->global->MAIN_INFO_SOCIETE_PAYS) print getCountry($conf->global->MAIN_INFO_SOCIETE_PAYS,1);
 	print '</td></tr>';
 
 	$var=!$var;
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index e07f13089c0..451865d5aec 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -199,9 +199,10 @@ function getCountry($id,$withcode=0)
 		$obj = $db->fetch_object($resql);
 		if ($obj)
 		{
-			$label=($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code)?$langs->trans("Country".$obj->code):($obj->libelle!='-'?$obj->libelle:'');
-			if ($withcode == 1) return $label=$obj->code?"$obj->code":"$obj->code - $label";
-			else if ($withcode == 2) return $label=$obj->code;
+			$langs->load("dict");
+			$label=($obj->code && ($langs->trans("Country".$obj->code)!="Country".$obj->code))?$langs->trans("Country".$obj->code):($obj->libelle!='-'?$obj->libelle:'');
+			if ($withcode == 1) return $label?"$obj->code - $label":"$obj->code";
+			else if ($withcode == 2) return $obj->code;
 			else return $label;
 		}
 		else