diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 5cf09642c68..b7a94bc28c4 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1128,6 +1128,10 @@ class Expedition extends CommonObject
 
 				// Eat-by date
 				if (! empty($conf->productbatch->enabled)) {
+                    /* test on conf at begining of file sometimes doesn't include expeditionbatch
+                     * May be conf is not well initialized for dark reason 
+                     */
+                    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 					$line->detail_batch=ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id);
 				}
 				$this->lines[$i] = $line;
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 1fd33b29c53..f203896f7b8 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -863,7 +863,7 @@ if ($action == 'create')
                     if (($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES)) || $defaultqty < 0) $defaultqty=0;
                 }
 
-				if (empty($conf->productbatch->enabled) ||  ! ($product->hasbatch() and is_array($product->stock_warehouse[GETPOST('entrepot_id','int')]))) 
+                if (empty($conf->productbatch->enabled) ||  ! ($product->hasbatch() and is_object($product->stock_warehouse[GETPOST('entrepot_id','int')]))) 
 				{
 	                // Quantity to send
 	                print '<td align="center">';