diff --git a/VERSION b/VERSION
index 7e6eed55..535f9bbf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-14 18:43:38) dev
+Version 2.00.0 (2012-07-14 20:15:46) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index 4cf34c26..f8bd23e4 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -4422,14 +4422,15 @@ class Wiki(object):
         menu = []
         tree = {'.':menu}
         for row in rows:
-            key = './'+row.menu
-            base = key.rsplit('/',1)[0]
-            subtree = tree[key] = []
-            if base in tree:
-                tree[base].append((current.T(row.title),
-                                   request.args(0)==row.slug,
-                                   URL(controller,function,args=row.slug),
-                                   subtree))
+            if row.menu:
+                key = './'+row.menu
+                base = key.rsplit('/',1)[0]
+                subtree = tree[key] = []
+                if base in tree:
+                    tree[base].append((current.T(row.title),
+                                       request.args(0)==row.slug,
+                                       URL(controller,function,args=row.slug),
+                                       subtree))
         if self.check_authorization(act=False):            
             submenu = []
             if URL() == URL(controller,function) and \