diff --git a/VERSION b/VERSION
index 20cd35e4..40b6cc5b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.2.1 (2012-10-29 08:57:40) stable
+Version 2.2.1 (2012-10-29 08:59:50) stable
diff --git a/gluon/utils.py b/gluon/utils.py
index 52f8a58b..d2ee474d 100644
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -37,7 +37,7 @@ try:
 except ImportError:
     try:
         from .aes import AES
-    except ImportError:
+    except (ImportError, ValueError):
         from contrib.aes import AES
 
 try: