--- a/server/querier.py	Fri Oct 01 17:04:09 2010 +0200
+++ b/server/querier.py	Fri Oct 01 18:49:47 2010 +0200
@@ -711,7 +711,7 @@
             # * don't rollback if we're in the commit process, will be handled
             #   by the session
             if session.commit_state is None:
-                session.rollback(reset_pool=False)
+                session.commit_state = 'uncommitable'
             raise
         # build a description for the results if necessary
         descr = ()