2 files changed, 13 insertions, 0 deletions
diff --git a/source/components/events/evgpe.c b/source/components/events/evgpe.c
index f5ea992a270b..7534f6d75025 100644
--- a/source/components/events/evgpe.c
+++ b/source/components/events/evgpe.c
@@ -240,6 +240,14 @@ AcpiEvEnableGpe (
     ACPI_FUNCTION_TRACE (EvEnableGpe);
 
 
+    /* Clear the GPE (of stale events) */
+
+    Status = AcpiHwClearGpe(GpeEventInfo);
+    if (ACPI_FAILURE(Status))
+    {
+        return_ACPI_STATUS(Status);
+    }
+
     /* Enable the requested GPE */
 
     Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE);
diff --git a/source/components/namespace/nsalloc.c b/source/components/namespace/nsalloc.c
index ff178d491bbc..127723081a31 100644
--- a/source/components/namespace/nsalloc.c
+++ b/source/components/namespace/nsalloc.c
@@ -232,6 +232,11 @@ AcpiNsDeleteNode (
     ACPI_FUNCTION_NAME (NsDeleteNode);
 
 
+    if (!Node)
+    {
+        return_VOID;
+    }
+
     /* Detach an object if there is one */
 
     AcpiNsDetachObject (Node);