diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index 8cd35c5166..51c250db5c 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -231,15 +231,15 @@ baffleThickness() const
     {
         if (thickness_.size() != patch().size())
         {
-            FatalErrorIn
+            FatalIOErrorIn
             (
                 " template<class solidType>"
                 " tmp<scalarField> thermalBaffle1DFvPatchScalarField<solidType>
-                " baffleThickness() const"
+                " baffleThickness() const",
+                solidDict_
             )<< " Field thickness has not been specified "
             << " for patch " << this->patch().name()
-            << " in dictionary " <<  solidDict_
-            << abort(FatalError);
+            << exit(FatalIOError);
         }
 
         return thickness_;
@@ -302,10 +302,15 @@ void thermalBaffle1DFvPatchScalarField<solidType>::autoMap
 )
 {
     mixedFvPatchScalarField::autoMap(m);
-    thickness_.autoMap(m);
-    Qs_.autoMap(m);
+
+    if (this->owner())
+    {
+        thickness_.autoMap(m);
+        Qs_.autoMap(m);
+    }
 }
 
+
 template<class solidType>
 void thermalBaffle1DFvPatchScalarField<solidType>::rmap
 (