--- a/server/session.py	Mon Jan 13 13:47:47 2014 +0100
+++ b/server/session.py	Mon Jan 13 13:56:16 2014 +0100
@@ -1066,7 +1066,7 @@
             return
         cstate = self.commit_state
         if cstate == 'uncommitable':
-            raise QueryError('transaction must be rollbacked')
+            raise QueryError('transaction must be rolled back')
         if cstate is not None:
             return
         # on rollback, an operation should have the following state
@@ -1745,7 +1745,7 @@
         self.user._cw = self # XXX remove when "vreg = user._cw.vreg" hack in entity.py is gone
         if not safe:
             self.disable_hook_categories('integrity')
-            self._tx.ctx_count += 1
+            self._cnx.ctx_count += 1
 
     def __enter__(self):
         return self