diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 293796c77a5..3f95060435d 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3859,22 +3859,22 @@ else if ($id > 0 || ! empty($ref))
 	{
 		/*
 		 * Affiche formulaire mail
-		*/
+		 */
 
 		// By default if $action=='presend'
 		$titreform='SendBillByMail';
 		$topicmail='SendBillRef';
-		$action='send';
 		$modelmail='facture_send';
 
 		if ($action == 'prerelance')	// For backward compatibility
 		{
 			$titrefrom='SendReminderBillByMail';
 			$topicmail='SendReminderBillRef';
-			$action='relance';
 			$modelmail='facture_relance';
+			$action='relance';
 		}
-
+		else $action='send';
+				
 		$ref = dol_sanitizeFileName($object->ref);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref, preg_quote($ref,'/'));
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>';