diff --git a/TS/TimeSeriesModel.py b/TS/TimeSeriesModel.py
index 7a60b00d1..7bc84714c 100644
--- a/TS/TimeSeriesModel.py
+++ b/TS/TimeSeriesModel.py
@@ -76,8 +76,9 @@ def updatePerfs(self, compute_all_indicators = False):
             lForecastPerf.compute(lFrameForecast[self.mOriginalSignal] ,
                                   lFrameForecast[lForecastColumnName],
                                   self.mOutName + '_Forecast')
-            lTestPerf.compute(lFrameTest[self.mOriginalSignal] , lFrameTest[lForecastColumnName],
-                              self.mOutName + '_Test')            
+            if(lFrameTest.shape[0] > 0):
+                lTestPerf.compute(lFrameTest[self.mOriginalSignal] , lFrameTest[lForecastColumnName],
+                                  self.mOutName + '_Test')            
             pass
         else:
             lFitPerf.computeCriterion(lFrameFit[self.mOriginalSignal] , lFrameFit[lForecastColumnName] ,
@@ -86,9 +87,10 @@ def updatePerfs(self, compute_all_indicators = False):
             lForecastPerf.computeCriterion(lFrameForecast[self.mOriginalSignal] , lFrameForecast[lForecastColumnName],
                                            self.mTimeInfo.mOptions.mModelSelection_Criterion,
                                            self.mOutName + '_Forecast')
-            lTestPerf.computeCriterion(lFrameTest[self.mOriginalSignal] , lFrameTest[lForecastColumnName],
-                                       self.mTimeInfo.mOptions.mModelSelection_Criterion,
-                                       self.mOutName + '_Test')
+            if(lFrameTest.shape[0] > 0):
+                lTestPerf.computeCriterion(lFrameTest[self.mOriginalSignal] , lFrameTest[lForecastColumnName],
+                                           self.mTimeInfo.mOptions.mModelSelection_Criterion,
+                                           self.mOutName + '_Test')
             
         self.mFitPerf = lFitPerf
         self.mForecastPerf = lForecastPerf;