2 files changed, 4 insertions, 2 deletions
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.C b/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.C
index 141f72eb0..4270aa000 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.C
@@ -113,6 +113,7 @@ extern "C" {
         }
 
     fapi_try_exit:
+        fapi2::ReturnCode saveError = fapi2::current_err;
 
         if ( fapi2::current_err && l_myAduFlag.getOperFailCleanup() )
         {
@@ -122,7 +123,7 @@ extern "C" {
         }
 
         FAPI_DBG("Exiting...");
-        return fapi2::current_err;
+        return saveError;
     }
 
 } // extern "C"
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C b/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C
index c41ca26be..214834377 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C
@@ -94,6 +94,7 @@ extern "C"
                  "Error from p9_adu_coherent_setup_registers");
 
     fapi_try_exit:
+        fapi2::ReturnCode saveError = fapi2::current_err;
 
         //if an error has occurred, ADU is dirty, and instructed to clean up,
         //attempt to reset ADU and free lock (propogate rc of original fail)
@@ -104,7 +105,7 @@ extern "C"
         }
 
         FAPI_DBG("Exiting...");
-        return fapi2::current_err;
+        return saveError;
     }
 
 } // extern "C"