diff --git a/Examples/FeatureExtraction/AsymmetricFusionOfLineDetectorExample.cxx b/Examples/FeatureExtraction/AsymmetricFusionOfLineDetectorExample.cxx
index 7a8e700791970ec50d5440f717cc0030a5aca528..3cac44998526a0c940adcd6888bad1f2cadbf549 100644
--- a/Examples/FeatureExtraction/AsymmetricFusionOfLineDetectorExample.cxx
+++ b/Examples/FeatureExtraction/AsymmetricFusionOfLineDetectorExample.cxx
@@ -203,7 +203,16 @@ int main(int argc, char * argv[])
   //  Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  filter->Update();
+  try
+    {
+    filter->Update();
+    }
+  catch (itk::ExceptionObject& err)
+    {
+    std::cerr << "ExceptionObject caught !" << std::endl;
+    std::cerr << err << std::endl;
+    return -1;
+    }
   // Software Guide : EndCodeSnippet
 
   writer->SetFileName(argv[2]);
diff --git a/Examples/Markov/MarkovRestorationExample.cxx b/Examples/Markov/MarkovRestorationExample.cxx
index 3821d1999eab7d2a34b13a4d5a55f9b9011ad6bf..1886ec468e2ced70bbb228c690340e409a27125f 100644
--- a/Examples/Markov/MarkovRestorationExample.cxx
+++ b/Examples/Markov/MarkovRestorationExample.cxx
@@ -223,7 +223,16 @@ int main(int argc, char* argv[])
 
   writer->SetInput(rescaleFilter->GetOutput());
 
-  writer->Update();
+  try
+    {
+    writer->Update();
+    }
+  catch (itk::ExceptionObject& err)
+    {
+    std::cerr << "ExceptionObject caught !" << std::endl;
+    std::cerr << err << std::endl;
+    return -1;
+    }
   // Software Guide : EndCodeSnippet
 
   // Software Guide : BeginLatex
diff --git a/Modules/Learning/Sampling/src/otbSamplingRateCalculator.cxx b/Modules/Learning/Sampling/src/otbSamplingRateCalculator.cxx
index f61ba32dc9bf642b34bfc2842e9da51938416d01..121ed2b588e3a292140643a04ca305dbed1e5e00 100644
--- a/Modules/Learning/Sampling/src/otbSamplingRateCalculator.cxx
+++ b/Modules/Learning/Sampling/src/otbSamplingRateCalculator.cxx
@@ -137,7 +137,7 @@ void SamplingRateCalculator
   // Then compute number of samples for each class
   for (it = m_RatesByClass.begin(); it != m_RatesByClass.end() ; ++it)
     {
-    double ratio = it->second.Tot / static_cast<double>(totalNumberOfSamplesAvailable);
+    double ratio = totalNumberOfSamplesAvailable != 0 ? it->second.Tot / static_cast<double>(totalNumberOfSamplesAvailable): 0;
 
     it->second.Required = static_cast<unsigned long>(0.5+ratio*value);
     this->UpdateRate(it->first);
diff --git a/Modules/Learning/Sampling/src/otbSamplingRateCalculatorList.cxx b/Modules/Learning/Sampling/src/otbSamplingRateCalculatorList.cxx
index 1ffe03a54cd51a35745ff5ec27b980146a4fb54c..56eca2cfaf0bc16f5449180f67ba31080aa16a99 100644
--- a/Modules/Learning/Sampling/src/otbSamplingRateCalculatorList.cxx
+++ b/Modules/Learning/Sampling/src/otbSamplingRateCalculatorList.cxx
@@ -372,19 +372,33 @@ SamplingRateCalculatorList
 
         total_nb_samples+=nb_samples[i];
         }
-        
-        for (unsigned int i=0 ; i<this->Size() ; i++)
-          {        
+
+      const Superclass::InternalContainerSizeType sampleListSize = this->Size();
+        for (unsigned int i=0 ; i<sampleListSize ; i++)
+          {
+          if (total_nb_samples != 0)
+            {
             this->GetNthElement(i)->SetTotalNumberOfSamples(vcl_floor(0.5+tot[0]*nb_samples[i]/static_cast<double>(total_nb_samples)));
+            }
+          else
+            {
+            this->GetNthElement(i)->SetTotalNumberOfSamples(0);
+            }
         }
       break;
       }
     case EQUAL:
       {
+      const Superclass::InternalContainerSizeType sampleListSize = this->Size();
 
-      unsigned long total_by_image = static_cast<unsigned long>(vcl_floor(tot[0]/static_cast<double>(this->Size())));
-      
-      for (unsigned int i=0 ; i<this->Size() ; i++)
+      unsigned long total_by_image = 0;
+        
+      if (sampleListSize != 0)
+        {
+        total_by_image = static_cast<unsigned long>(vcl_floor(tot[0]/static_cast<double>(sampleListSize)));
+        }
+
+      for (unsigned int i=0 ; i<sampleListSize ; i++)
         {
         this->GetNthElement(i)->SetTotalNumberOfSamples(total_by_image);
         }        
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdTypes.h b/Modules/Visualization/MonteverdiCore/include/mvdTypes.h
index e895260d3b1b4f797264cd6876ffe29b71613fe0..27fbc5a90ebd90e64a4129c61566f24ef443e76c 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdTypes.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdTypes.h
@@ -217,6 +217,7 @@ struct PixelInfo
     m_Point(),
     m_Index(),
     m_Pixel(),
+    m_Resolution (1),
     m_HasPoint( false ),
     m_HasIndex( false ),
     m_HasPixel( false ),
diff --git a/Modules/Visualization/MonteverdiGui/include/mvdImportImagesDialog.h b/Modules/Visualization/MonteverdiGui/include/mvdImportImagesDialog.h
index e887e4ddbc4854992e56cbc57497b140d37faf6b..336adf0b8994422b692025e7fbe39a4e8c2f54fd 100644
--- a/Modules/Visualization/MonteverdiGui/include/mvdImportImagesDialog.h
+++ b/Modules/Visualization/MonteverdiGui/include/mvdImportImagesDialog.h
@@ -165,10 +165,6 @@ private:
    */
   Ui::ImportImagesDialog * m_UI;
 
-  /**
-   */
-  QPushButton * m_IgnoreButton;
-
   /**
    */
   GDALOverviewsBuilderVector m_GDALOverviewsBuilders;