diff --git a/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniDialogoImportService.java b/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniDialogoImportService.java
index ec8a0dface..e2d9788098 100644
--- a/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniDialogoImportService.java
+++ b/ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniDialogoImportService.java
@@ -17,6 +17,8 @@ import it.integry.ems_model.utility.Query;
 import it.integry.ems_model.utility.UtilityDB;
 import it.integry.ems_model.utility.UtilityHashMap;
 import it.integry.ems_model.utility.UtilityString;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
@@ -40,6 +42,9 @@ public class OrdiniDialogoImportService {
     @Autowired
     private SetupGest setupGest;
 
+
+    private final Logger logger = LogManager.getLogger();
+
     public List<EntityBase> importOrdiniDialogoFromCSV(String type, String format, String rawContentInput) throws Exception {
         List<EntityBase> entityList = new ArrayList<EntityBase>();
         final String partIvaInfagruppo = "00000000000";
@@ -49,8 +54,10 @@ public class OrdiniDialogoImportService {
         String csvDialogo = rawContentInput.toUpperCase();
         CsvMapper<OrdiniDialogoDTO.Import> mapper = new CsvMapper<OrdiniDialogoDTO.Import>();
         List<OrdiniDialogoDTO.Import> dialogoList = mapper.deserialize(csvDialogo, OrdiniDialogoDTO.Import.class, "\t");
-        if (dialogoList == null)
-            throw new Exception("Nessuno ordine da importare");
+        if (dialogoList == null) {
+            logger.error("Nessuno ordine da importare");
+            return null;
+        }
 
         String sql = "SELECT part_iva FROM azienda";
         HashMap<String, Object> queryResult = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryDatasource().getConnection(), sql);
@@ -266,15 +273,17 @@ public class OrdiniDialogoImportService {
                     }
 
                     testata.setOperation(OperationType.INSERT);
-                    entityList.add(testata);
 
                     HashMap<String, Object> queryResult = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryDatasource().getConnection(), query);
 
                     if (queryResult != null) {
-                        throw new Exception("Ordine già importato (Ordine N° " + queryResult.get("num_ord").toString() +
+                        logger.error("Ordine già importato (Ordine N° " + queryResult.get("num_ord").toString() +
                                 " del " + new SimpleDateFormat(CommonConstants.DATE_FORMAT_DMY).format(queryResult.get("data_ord")) + ")");
+                        break;
                     }
 
+                    entityList.add(testata);
+
                     Date dataOrd = rigaDialogo.getDataOrd();
 
                     termCons = rigaDialogo.getTermCons();