diff --git a/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java b/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java
index c79f8b66d3de64347b56770acd6c2606c8756d6f..1f45f90d079b4a61b4b0531f7772d49bd9fa7a1f 100644
--- a/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java
+++ b/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java
@@ -536,14 +536,26 @@ public class AlternariaModel extends I18nImpl implements Model{
         double  meanTeamperature    =   0.0;
         int     leafWetnessHour     =   0;
         
-        if(tmDate.compareTo(lwDate) == 0)
+        if((null != tmDate) && (null != lwDate))
         {
-            meanTeamperature        =   dataMatrix.getParamDoubleValueForDate(tmDate, tmFlag);
-            leafWetnessHour         =   dataMatrix.getParamIntValueForDate(lwDate, lwFlag);
-            resultDSV               =   getDSV_DAILY(meanTeamperature, leafWetnessHour);
-            
-            //Set DSV into data matrix
-            dataMatrix.setParamIntValueForDate(lwDate, DataMatrix.DAILY_DISEASE_SEVERITY_VALUE, resultDSV);
+            if(tmDate.compareTo(lwDate) == 0)
+            {
+                meanTeamperature        =       (null ==  dataMatrix.getParamDoubleValueForDate(tmDate, tmFlag))
+                                            ?   meanTeamperature
+                                            :   dataMatrix.getParamDoubleValueForDate(tmDate, tmFlag);
+                leafWetnessHour         =       (null == dataMatrix.getParamIntValueForDate(lwDate, lwFlag))
+                                            ?   leafWetnessHour
+                                            :   dataMatrix.getParamIntValueForDate(lwDate, lwFlag);
+                
+                if(meanTeamperature != 0.0 && leafWetnessHour != 0)
+                {
+                    resultDSV               =   getDSV_DAILY(meanTeamperature, leafWetnessHour);
+                    //Set DSV into data matrix
+                    dataMatrix.setParamIntValueForDate(lwDate, DataMatrix.DAILY_DISEASE_SEVERITY_VALUE, resultDSV);
+
+                }
+
+            }
         }
         
     }