diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index de3a47d36d4..429566e054d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3126,7 +3126,13 @@ class Commande extends CommonOrder
             if ($result < 0) $error++;
             // End call triggers
         }
-
+        
+        if ($this->nb_expedition() != 0) 
+	{
+		$this->errors[] = $langs->trans('SomeShipmentExists');
+		$error++;
+	}
+	    
         //TODO: Check for error after each action. If one failed we rollback, don't waste time to do action if previous fail
         if (! $error)
         {