--- a/server/serverctl.py	Tue Sep 20 15:14:04 2011 +0200
+++ b/server/serverctl.py	Wed Sep 21 17:38:00 2011 +0200
@@ -248,7 +248,7 @@
                         cursor.execute, 'DROP USER %s' % user) is not ERROR:
                         print '-> user %s dropped.' % user
                 cnx.commit()
-            except:
+            except BaseException:
                 cnx.rollback()
                 raise
 
@@ -363,7 +363,7 @@
                 createdb(helper, source, dbcnx, cursor)
                 dbcnx.commit()
                 print '-> database %s created.' % dbname
-            except:
+            except BaseException:
                 dbcnx.rollback()
                 raise
         cnx = system_source_cnx(source, special_privs='CREATE LANGUAGE',