diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h
index 6191c6634070b56eb7fea63613c4c5040964447f..36c9a2e8484bee44b9dd3326fdc195f69815abd6 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h
@@ -43,7 +43,7 @@ class CSCDigitVariables : public ValAlgVariables
   {
     if( (this->deleteVariables()).isFailure() ){
       ATH_MSG_ERROR("Failing to delete CSCDigitVariables.");
-      throw;
+      std::terminate();
     }
   }
 
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h
index dd2cf05fe1c586d9884197b2b493d5513c17b612..a17cf294e6da7ad8e894cdc026ab7e4f89455fd8 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h
@@ -64,7 +64,7 @@ class MMDigitVariables : public ValAlgVariables
   {
     if( (this->deleteVariables()).isFailure() ){
       ATH_MSG_ERROR("Failing to delete MMDigitVariables.");
-      throw;
+      std::terminate();
     }
   }
 
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMFastDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMFastDigitVariables.h
index 1f43aef79ff713b24e0143fa92db7a1ca1a3aee6..d978b62bd387527eca8c0cf3812a86d42b743203 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMFastDigitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMFastDigitVariables.h
@@ -44,7 +44,7 @@ class MMFastDigitVariables : public ValAlgVariables
   {
     if( (this->deleteVariables()).isFailure() ){
       ATH_MSG_ERROR("Failing to delete MMFastDigitVariables.");
-      throw;
+      std::terminate();
     }
   }
 
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h
index e0f323d98973a0d133312c05747aa12e6acb3f7c..bed164413de86be4372d87561b75b8c9a228c591 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h
@@ -72,7 +72,7 @@ class MMSimHitVariables : public ValAlgVariables
   {
     if( (this->deleteVariables()).isFailure() ){
       ATH_MSG_ERROR("Failing to delete MMSimHitVariables.");
-      throw;
+      std::terminate();
     }
   }
 
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h
index 3bb6f6534d2305b71049cae880bcc9635c22666d..b4226cdcbf50be7f54a5949fa5e4b2c08d1e2c6b 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h
@@ -37,7 +37,7 @@ class MuEntryVariables : public ValAlgVariables
   {
     if( (this->deleteVariables()).isFailure() ){
       ATH_MSG_ERROR("Failing to delete MuEntryVariables.");
-      throw;
+      std::terminate();
     }
   }
 
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h
index ca0cb290c372a31b94e08f97e91c7312337b3c19..dc6ae08acb3d08512c88ce157d7fc39bac8e91ec 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h
@@ -43,7 +43,7 @@ class TruthVariables : public ValAlgVariables
   {
     if( (this->deleteVariables()).isFailure() ){
       ATH_MSG_ERROR("Failing to delete TruthVariables.");
-      throw;
+      std::terminate();
     }
   }
 
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h
index 3d4f507ba643c2b80bc7cecafccec7b2a74e919d..5842fa59953ccd9403d0cabc803358a7dd1e4980 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h
@@ -68,7 +68,7 @@ class sTGCDigitVariables : public ValAlgVariables
   {
     if( (this->deleteVariables()).isFailure() ){
       ATH_MSG_ERROR("Failing to delete sTGCDigitVariables.");
-      throw;
+      std::terminate();
     }
   }
 
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCFastDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCFastDigitVariables.h
index 5c34fa297526e059770dcd4745ebd41927037282..cb8580b362f2222be7adeac4ea1b5d0336dd3702 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCFastDigitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCFastDigitVariables.h
@@ -46,7 +46,7 @@ class sTGCFastDigitVariables : public ValAlgVariables
   {
     if( (this->deleteVariables()).isFailure() ){
       ATH_MSG_ERROR("Failing to delete sTGCFastDigitVariables.");
-      throw;
+      std::terminate();
     }
   }
 
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h
index becf773168a85e5784af45d76b8e0fab01615b7f..8fa9922abea37181d0dd84faf3f2c2dfae0bcacb 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h
@@ -78,7 +78,7 @@ class sTGCSimHitVariables : public ValAlgVariables
   {
     if( (this->deleteVariables()).isFailure() ){
       ATH_MSG_ERROR("Failing to delete sTGCSimHitVariables.");
-      throw;
+      std::terminate();
     }
   }