diff --git a/VERSION b/VERSION
index 2c6f6816..e00188f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.9 (2012-10-04 08:44:15) dev
+Version 2.0.9 (2012-10-04 10:44:23) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index 34cfdd3d..6e410446 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -4703,14 +4703,14 @@ class Wiki(object):
 
     def first_paragraph(self,page):
         if not self.can_read(page):
-            mm = page.body.replace('\r','')
+            mm = (page.body or '').replace('\r','')
             ps = [p for p in mm.split('\n\n') \
                       if not p.startswith('#') and p.strip()]
             if ps: return ps[0]
         return ''
 
     def fix_hostname(self,body):
-        return body.replace('://HOSTNAME','://%s' % self.host)
+        return (body or '').replace('://HOSTNAME','://%s' % self.host)
 
     def read(self,slug):
         if slug in '_cloud':