diff --git a/CHANGELOG b/CHANGELOG
index 5dd4d0a4..2f63bf9f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,7 @@
 - bootstrap 2.3.2
 - codemirror 3.19
 - improved  mongoDB support, thanks Alan
-- suport for wiki custom render function
+- support for wiki custom render function
 - Wiki(...groups=['x','y']) allows bypassing default permissions
 - fixed websocket_messaging.py to support newer Tornado
 - NDB support for GAE, thanks Quint
diff --git a/VERSION b/VERSION
index f4ed8b1b..d3f8266f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.8.1-stable+timestamp.2013.11.27.13.52.50
+Version 2.8.1-stable+timestamp.2013.11.28.07.50.08
diff --git a/gluon/cache.py b/gluon/cache.py
index f4619a02..69eb37ea 100644
--- a/gluon/cache.py
+++ b/gluon/cache.py
@@ -254,7 +254,10 @@ class CacheOnDisk(CacheAbstract):
         try:
             if self.storage:
                 self.storage.close()
+        except ValueError:
+            pass
         finally:
+            self.storage = None
             if self.locker and self.locked:
                 portalocker.unlock(self.locker)
                 self.locker.close()
diff --git a/gluon/shell.py b/gluon/shell.py
index 2c1e0f70..0ced4c25 100644
--- a/gluon/shell.py
+++ b/gluon/shell.py
@@ -131,8 +131,11 @@ def env(
     request.function = f or 'index'
     response.view = '%s/%s.html' % (request.controller,
                                     request.function)
-    ip = global_settings.cmd_options.ip
-    port = global_settings.cmd_options.port 
+    if global_settings.cmd_options:
+        ip = global_settings.cmd_options.ip
+        port = global_settings.cmd_options.port 
+    else:
+        ip, port = '127.0.0.1', '8000'
     request.env.http_host = '%s:%s' % (ip,port)
     request.env.remote_addr = '127.0.0.1'
     request.env.web2py_runtime_gae = global_settings.web2py_runtime_gae