diff --git a/source/tools/acpiexec/aeexec.c b/source/tools/acpiexec/aeexec.c
index 789ef6721..acbe2dc3d 100644
--- a/source/tools/acpiexec/aeexec.c
+++ b/source/tools/acpiexec/aeexec.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: aeexec - Top level parse and execute routines
- *              $Revision: 1.45 $
+ *              $Revision: 1.46 $
  *
  *****************************************************************************/
 
@@ -426,6 +426,9 @@ AeInstallHandlers (void)
     UINT32                  i;
 
 
+    PROC_NAME ("AeInstallHandlers");
+
+
     Status = AcpiInstallNotifyHandler (ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY,
                                         AeNotifyHandler, NULL);
     if (ACPI_FAILURE (Status))
@@ -445,8 +448,10 @@ AeInstallHandlers (void)
                         (ACPI_ADR_SPACE_TYPE) i, AeRegionHandler, AeRegionInit, NULL);
         if (ACPI_FAILURE (Status))
         {
-            printf ("Could not install an OpRegion handler for %s space (%d)\n", 
-                AcpiUtGetRegionName((UINT8) i), i);
+            ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, 
+                "Could not install an OpRegion handler for %s space (%d)\n", 
+                AcpiUtGetRegionName((UINT8) i), i));
+            return (Status);
         }
     }
 
diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c
index fb801c4c9..13edebd19 100644
--- a/source/tools/acpiexec/aemain.c
+++ b/source/tools/acpiexec/aemain.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: aemain - Main routine for the AcpiExec utility
- *              $Revision: 1.41 $
+ *              $Revision: 1.42 $
  *
  *****************************************************************************/
 
@@ -391,7 +391,11 @@ main (
         /* TBD:
          * Need a way to call this after the "LOAD" command
          */
-        AeInstallHandlers ();
+        Status = AeInstallHandlers ();
+        if (ACPI_FAILURE (Status))
+        {
+            goto enterloop;
+        }
 
         Status = AcpiEnableSubsystem (InitFlags);
         if (ACPI_FAILURE (Status))
@@ -434,7 +438,11 @@ main (
         /* TBD:
          * Need a way to call this after the "LOAD" command
          */
-        AeInstallHandlers ();
+        Status = AeInstallHandlers ();
+        if (ACPI_FAILURE (Status))
+        {
+            goto enterloop;
+        }
 
         Status = AcpiEnableSubsystem (InitFlags);
         if (ACPI_FAILURE (Status))