diff --git a/VERSION b/VERSION
index e25adc93..3185ad5a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-02 21:51:02) dev
+Version 2.00.0 (2012-08-03 00:55:12) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index 922b699a..17f68ec2 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -2591,8 +2591,9 @@ class Auth(object):
             redirect(next)
         return form
 
-    def is_impersonating(self):
-        return 'impersonator' in current.session.auth
+    def is_impersonating(self):        
+        return current.session.auth and \
+            'impersonator' in current.session.auth
 
     def impersonate(self, user_id=DEFAULT):
         """