diff --git a/VERSION b/VERSION
index 946fe36c..5e4667b0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.8.2-stable+timestamp.2013.12.17.16.39.21
+Version 2.8.2-stable+timestamp.2013.12.17.16.41.58
diff --git a/gluon/contrib/shell.py b/gluon/contrib/shell.py
index 4d206036..0a224100 100755
--- a/gluon/contrib/shell.py
+++ b/gluon/contrib/shell.py
@@ -258,7 +258,7 @@ def run(history, statement, env={}):
                 if not name.startswith('__'):
                     try:
                         history.set_global(name, val)
-                    except TypeError, ex:
+                    except (TypeError, cPickle.PicklingError), ex:
                         UNPICKLABLE_TYPES.append(type(val))
                         history.add_unpicklable(statement, new_globals.keys())