diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
index f2200ddd2950c0cf057120dc06c14d8f81d68530..bbaf51aec9ad7e41bb673701cd8c89bd2e74ee99 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
@@ -143,10 +143,12 @@ inline
 void otb::ogr::Feature::SetGeometryDirectly(UniqueGeometryPtr geometry)
 {
   CheckInvariants();
+#if !defined(NDEBUG)
   OGRGeometry * g = geometry.get();
+#endif
   UncheckedSetGeometryDirectly(otb::move(geometry));
-  itkAssertOrThrowMacro((m_Feature->GetGeometryRef() == g), "The new geometry hasn't been set as expected");
-  itkAssertOrThrowMacro(!geometry, "UniqueGeometryPtr hasn't released its pointer");
+  assert((m_Feature->GetGeometryRef() == g) && "The new geometry hasn't been set as expected");
+  assert(!geometry && "UniqueGeometryPtr hasn't released its pointer");
 }
 
 inline