diff --git a/Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.cpp b/Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.cpp
index 658a943..0ba0cc3 100644
--- a/Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.cpp
+++ b/Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.cpp
@@ -454,12 +454,17 @@ ::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, Threa
       meas_m /= input.N;
 
       vnl_matrix<double> X(input.N,2);
+	  bool nan_element = false;
       for(int i=0; i<input.N; i++)
       {
         X(i,0) = input.bvals[i] - bval_m;
         X(i,1) = input.meas[i] - meas_m;
+		if (std::isnan(X(i,1)) || std::isnan(X(i,1)))
+		  nan_element = true;
       }
 
+      if (!nan_element)
+	  {
       vnl_matrix<double> XX = X.transpose() * X;
       vnl_symmetric_eigensystem<double> eigs(XX);
 
@@ -505,6 +510,7 @@ ::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, Threa
 
         m_Snap.currentDStar = min_val + opt_idx * ((max_val-min_val) / num_its);
       }
+	  }
       // MITK_INFO << "choosing " << opt_idx << " => " << DStar;
       //          x_dstar_only[0] = 0.01;
       //          // f 0.1 Dstar 0.01 D 0.001