diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
index 129bfe85157ee70c167dbbc9c80042dfd81d1c28..e7d4f08faf482754367472240ff74e43051a9edf 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
@@ -81,7 +81,10 @@ const Trk::Surface&  CaloSurfaceHelper::GetFlatEntrySurface (const CaloCell_ID::
 
   const Trk::Surface* surf = side>0 ? m_flatEntrySurfs[sample].first : m_flatEntrySurfs[sample].second;
 
-  if (!surf) ATH_MSG_FATAL(" failed to retrieve flat entry layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+  if (!surf) {
+    ATH_MSG_FATAL(" failed to retrieve flat entry layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+    std::abort();
+  }
   return *surf;
 }
 
@@ -89,7 +92,10 @@ const Trk::Surface& CaloSurfaceHelper::GetEntrySurface(const CaloCell_ID::CaloSa
 
   const Trk::Surface* surf = side>0 ? m_entrySurfs[sample].first : m_entrySurfs[sample].second;
 
-  if (!surf) ATH_MSG_FATAL(" failed to retrieve entry layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+  if (!surf) {
+    ATH_MSG_FATAL(" failed to retrieve entry layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+    std::abort();
+  }
   return *surf;
 }
 
@@ -97,7 +103,10 @@ const Trk::Surface& CaloSurfaceHelper::GetExitSurface (const CaloCell_ID::CaloSa
 
   const Trk::Surface* surf = side>0 ? m_exitSurfs[sample].first : m_exitSurfs[sample].second;
 
-  if (!surf) ATH_MSG_FATAL(" failed to retrieve exit layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+  if (!surf) {
+    ATH_MSG_FATAL(" failed to retrieve exit layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+    std::abort();
+  }
   return *surf;
 }
 
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx
index 876a01a83c1da11427105e069f650b70f02fd87a..a1c927350e470431133a438899e123da59e900fb 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx
@@ -284,8 +284,8 @@ const Trk::TrackingGeometry* Calo::CaloTrackingGeometryBuilder::trackingGeometry
       if ( msCutouts.empty() ) msCutouts.push_back( envelopeDefs[i] );
       else {
 	RZPairVector::iterator envIter = msCutouts.begin();
-        while (envIter!= msCutouts.end() && (*envIter).second < envelopeDefs[i].second ) envIter++;
-        while (envIter!= msCutouts.end() && (*envIter).second == envelopeDefs[i].second && (*envIter).first  > envelopeDefs[i].first ) envIter++;
+        while (envIter!= msCutouts.end() && (*envIter).second < envelopeDefs[i].second ) ++envIter;
+        while (envIter!= msCutouts.end() && (*envIter).second == envelopeDefs[i].second && (*envIter).first  > envelopeDefs[i].first ) ++envIter;
 	msCutouts.insert(envIter, envelopeDefs[i]);
       }
     }
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx
index 1992999c271be8fc4091b294a3cfefb1592722b3..f2a4f973f7f2ed37e952e29681258fd0d7898819 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx
@@ -291,8 +291,8 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> Calo::CaloTrackingGeometry
       if ( msCutouts.empty() ) msCutouts.push_back( envelopeDefs[i] );
       else {
 	RZPairVector::iterator envIter = msCutouts.begin();
-        while (envIter!= msCutouts.end() && (*envIter).second < envelopeDefs[i].second ) envIter++;
-        while (envIter!= msCutouts.end() && (*envIter).second == envelopeDefs[i].second && (*envIter).first  > envelopeDefs[i].first ) envIter++;
+        while (envIter!= msCutouts.end() && (*envIter).second < envelopeDefs[i].second ) ++envIter;
+        while (envIter!= msCutouts.end() && (*envIter).second == envelopeDefs[i].second && (*envIter).first  > envelopeDefs[i].first ) ++envIter;
 	msCutouts.insert(envIter, envelopeDefs[i]);
       }
     }