diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 1eebac9a7a0..7ccd6450767 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -120,6 +120,12 @@ class db(netsvc.ExportService):
         db = sql_db.db_connect('postgres')
         cr = db.cursor()
         chosen_template = tools.config['db_template']
+        cr.execute("""SELECT datname 
+                              FROM pg_database
+                              WHERE datname = %s """,
+                           (name,))
+        if cr.fetchall():
+            raise openerp.exceptions.Warning(" %s database already exists!" % name )
         try:
             cr.autocommit(True) # avoid transaction block
             cr.execute("""CREATE DATABASE "%s" ENCODING 'unicode' TEMPLATE "%s" """ % (name, chosen_template))