diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index 89de057f5d062c8f8a8f9ede39850f7b0de9ac7d..528e8b895dc63855b1d00299732881039d1fb790 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -227,8 +227,8 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
     reduce(sumMagPhi, sumOp<scalar>());
     reduce(primaryInletTfMean, sumOp<scalar>());
 
-    primaryInletTfMean /= sumMagPhi;
-    CpfMean /= sumMagPhi;
+    primaryInletTfMean /= sumMagPhi + ROOTVSMALL;
+    CpfMean /= sumMagPhi + ROOTVSMALL;
 
     scalar primaryInletT = primaryInletT_;
     if (!userPrimaryInletT_)
@@ -285,18 +285,17 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
         {
             label celli = cells_[i];
             heSource[celli] -=
-                Qt*V[celli]*mag(U[celli])*deltaTCells[i]/sumWeight;
+                Qt*V[celli]*mag(U[celli])*deltaTCells[i]
+               /(sumWeight + ROOTVSMALL);
         }
     }
 
-    if (debug && Pstream::master())
-    {
-        Info<< indent << "Net mass flux [Kg/s]      : " << sumPhi << nl;
-        Info<< indent << "Total energy exchange [W] : " << Qt << nl;
-        Info<< indent << "Tref [K]                  : " << Tref << nl;
-        Info<< indent << "Efficiency                : "
-            << eTable_()(mag(sumPhi), secondaryMassFlowRate_) << endl;
-    }
+    DebugInfo
+        << indent << "Net mass flux [Kg/s]      : " << sumPhi << nl
+        << indent << "Total energy exchange [W] : " << Qt << nl
+        << indent << "Tref [K]                  : " << Tref << nl
+        << indent << "Efficiency                : "
+        << eTable_()(mag(sumPhi), secondaryMassFlowRate_) << endl;
 }