diff --git a/Code/BasicFilters/otbLabelImageRegionPruningFilter.txx b/Code/BasicFilters/otbLabelImageRegionPruningFilter.txx
index 37a2a0405622f85c32e2a87aed7ab6dbdfa270e9..f7ecaa77a29da859695f65d670b80cd427bf7ead 100644
--- a/Code/BasicFilters/otbLabelImageRegionPruningFilter.txx
+++ b/Code/BasicFilters/otbLabelImageRegionPruningFilter.txx
@@ -402,13 +402,16 @@ LabelImageRegionPruningFilter<TInputLabelImage, TInputSpectralImage, TOutputLabe
 
       LabelType l = outputIt.Get();
       LabelType canLabel;
-      assert(m_CanonicalLabels[l] <= oldRegionCount);
+      if (m_CanonicalLabels[l] <= oldRegionCount)
+        {
+        itkAssertInDebugAndIgnoreInReleaseMacro( 0 );
+        }
       canLabel = newLabels[m_CanonicalLabels[l]];
       outputIt.Set( canLabel );
-
       ++outputIt;
       }
 
+
     finishedPruning =  !minRegionCount ||  regionCount == 1 ||  pruneIterations>=10;
 
     // only one iteration for now
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx
index d713e4abdbd169405cad5875cdb20f350fea4c49..f2200ddd2950c0cf057120dc06c14d8f81d68530 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx
@@ -145,10 +145,8 @@ void otb::ogr::Feature::SetGeometryDirectly(UniqueGeometryPtr geometry)
   CheckInvariants();
   OGRGeometry * g = geometry.get();
   UncheckedSetGeometryDirectly(otb::move(geometry));
-  assert(m_Feature->GetGeometryRef() == g && "The new geometry hasn't been set as expected");
-  assert(! geometry && "UniqueGeometryPtr hasn't released its pointer");
-  // avoid unused variable warning
-  g=NULL;
+  itkAssertOrThrowMacro((m_Feature->GetGeometryRef() == g), "The new geometry hasn't been set as expected");
+  itkAssertOrThrowMacro(!geometry, "UniqueGeometryPtr hasn't released its pointer");
 }
 
 inline
@@ -156,7 +154,7 @@ otb::ogr::UniqueGeometryPtr otb::ogr::Feature::StealGeometry()
 {
   CheckInvariants();
   UniqueGeometryPtr res = UncheckedStealGeometry();
-  assert(! m_Feature->GetGeometryRef() && "Geometry hasn't been properly stolen");
+  itkAssertOrThrowMacro(!m_Feature->GetGeometryRef(), "Geometry hasn't been properly stolen");
   return otb::move(res);
 }