2 files changed, 6 insertions, 10 deletions
diff --git a/source/tools/acpiexec/aeexception.c b/source/tools/acpiexec/aeexception.c
index a5a3293ad3042..62e9db0a01228 100644
--- a/source/tools/acpiexec/aeexception.c
+++ b/source/tools/acpiexec/aeexception.c
@@ -259,21 +259,16 @@ AeExceptionHandler (
 
 Cleanup:
 
-    /* Global overrides */
-
     if (AcpiGbl_IgnoreErrors)
     {
+        /* Global option to ignore all method errors, just return OK */
+
         NewAmlStatus = AE_OK;
     }
-    else if (AmlStatus == AE_AML_INTERNAL)
-    {
-        NewAmlStatus = AE_AML_INTERNAL;
-        AcpiOsPrintf (AE_PREFIX
-            "Cannot override status %s\n\n",
-            AcpiFormatException (NewAmlStatus));
-    }
-    else if (NewAmlStatus != AmlStatus)
+    if (NewAmlStatus != AmlStatus)
     {
+        /* Request to override actual status with a different status */
+
         AcpiOsPrintf (AE_PREFIX
             "Exception override, new status %s\n\n",
             AcpiFormatException (NewAmlStatus));
diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c
index 2601d3369b892..3ea512100da4b 100644
--- a/source/tools/acpiexec/aemain.c
+++ b/source/tools/acpiexec/aemain.c
@@ -792,5 +792,6 @@ NormalExit:
 
 ErrorExit:
     (void) AcpiOsTerminate ();
+    AcDeleteTableList (ListHead);
     return (ExitCode);
 }