diff --git a/Jenkinsfile b/Jenkinsfile
index d3eedac8..21d0bb26 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=638']) {
+        withEnv(['NEXT_BUILD_NUMBER=639']) {
           // env.versionNumber = VersionNumber(versionNumberString : '4.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '4.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'MAPO'
diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs
index 27add7e3..1e3b2518 100644
--- a/MapoDb/DataLayer.cs
+++ b/MapoDb/DataLayer.cs
@@ -756,7 +756,7 @@ namespace MapoDb
             // salvo in Redis nell'area CURR_VAL TUTTI i valori live
             memLayer.ML.redSaveHash(LiveCurrValHash(idxMacchina), liveSet);
             // accodo in buffer ULTIMI valori con dataora uno ad uno...
-            KeyValuePair<string, string>[] newData= new KeyValuePair<string, string>[1];
+            KeyValuePair<string, string>[] newData = new KeyValuePair<string, string>[1];
             foreach (var item in liveSet)
             {
               // accodo update valori...
@@ -882,7 +882,7 @@ namespace MapoDb
       }
       catch (Exception exc)
       {
-        logger.lg.scriviLog(string.Format("Errore in compilazione dati Macchine x Redis:{0}{1}", Environment.NewLine, exc));
+        logger.lg.scriviLog(string.Format("Errore in compilazione dati Macchine x Redis - idxMacchina {2}:{0}{1}", Environment.NewLine, exc, idxMacchina));
       }
       return answ;
     }
@@ -909,9 +909,27 @@ namespace MapoDb
       {
         tabMSFD = MapoDb.obj.taMSFD.getByIdxMacc(idxMacchina);
       }
+      // se ho righe...
+      DS_applicazione.MSFDDataTable tab = new DS_applicazione.MSFDDataTable();
+      DS_applicazione.MSFDRow rigaMSFD;
+      if (tabMSFD.Rows.Count > 0)
+      {
+        try
+        {
+          rigaMSFD = tabMSFD[0];
+        }
+        catch
+        {
+          rigaMSFD = tab.NewMSFDRow();
+        }
+      }
+      else
+      {
+        rigaMSFD = tab.NewMSFDRow();
+      }
+      // ora provo a compilare...
       try
       {
-        DS_applicazione.MSFDRow rigaMSFD = tabMSFD[0];
         // salvo 1:1 i valori... STATO
         answ.Add("IdxMicroStato", rigaMSFD.IdxMicroStato.ToString());
         answ.Add("IdxStato", rigaMSFD.IdxStato.ToString());
@@ -940,8 +958,10 @@ namespace MapoDb
         answ.Add("simplePallet", rigaMSFD.simplePallet.ToString());
         answ.Add("palletChange", rigaMSFD.palletChange.ToString());
       }
-      catch
-      { }
+      catch(Exception exc)
+      {
+        logger.lg.scriviLog(string.Format("Errore in compilazione dati MSFD:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
+      }
       // verifico il timeout che cambia a seconda che sia vero o falso insEnabled...
       int tOutShort = memLayer.ML.cdvi("TmOut.MS.S");
       int tOutLong = memLayer.ML.cdvi("TmOut.MS.L");