diff --git a/VERSION b/VERSION
index 49828b3f..4dfeee4b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.4 (2012-02-22 11:32:05) stable
+Version 1.99.4 (2012-02-25 12:57:49) stable
diff --git a/gluon/tools.py b/gluon/tools.py
index 0f176dc4..d8394054 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -2498,7 +2498,9 @@ class Auth(object):
     def update_groups(self):
         if not self.user:
             return
-        user_groups = self.user_groups = current.session.auth.user_groups = {}
+        user_groups = self.user_groups = {}
+        if current.session.auth:
+            current.session.auth.user_groups = self.user_groups
         memberships = self.db(self.settings.table_membership.user_id
                               == self.user.id).select()
         for membership in memberships: