diff --git a/source/components/namespace/nsnames.c b/source/components/namespace/nsnames.c
index efe96b412..904571ac9 100644
--- a/source/components/namespace/nsnames.c
+++ b/source/components/namespace/nsnames.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: nsnames - Name manipulation and search
- *              $Revision: 1.83 $
+ *              $Revision: 1.85 $
  *
  ******************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -281,7 +281,12 @@ AcpiNsGetPathnameLength (
         NextNode = AcpiNsGetParentNode (NextNode);
     }
 
-    return (Size + 1);
+    if (!Size)
+    {
+        Size = 1;       /* Root node case */
+    }
+
+    return (Size + 1);  /* +1 for null string terminator */
 }