diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index d3acac48bd4..ee07ee7255e 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3859,7 +3859,7 @@ else if ($id > 0 || ! empty($ref))
 	{
 		/*
 		 * Affiche formulaire mail
-		*/
+		 */
 
 		// By default if $action=='presend'
 		$titreform='SendBillByMail';
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index 104f92a84a9..a60deff921e 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -268,8 +268,11 @@ else
 
 			// Country
 			print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
-			$img=picto_from_langcode($object->country_code);
-			print ($img?$img.' ':'');
+			if (! empty($object->country_code)) 
+			{
+				$img=picto_from_langcode($object->country_code);
+				print ($img?$img.' ':'');
+			}
 			print $object->country;
 			print '</td></tr>';