diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
index 1f79f49951199a0cd0a3d15abd5d03cf2e23c926..4d30c0935bcb9b06d0ab3ac4c3837ee7f91b61c9 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
@@ -95,7 +95,13 @@ public class DBMigrationEngine
             String createUserSQL = createScript("createUser.sql", owner, databaseName);
             String createDatabaseSQL = createScript("createDatabase.sql", owner, databaseName);
             
-            template.execute(createUserSQL);
+            try
+            {
+                template.execute(createUserSQL);
+            } catch (BadSqlGrammarException ex)
+            {
+                // TODO: have better error checking here.
+            }
             template.execute(createDatabaseSQL);
             
             migrateOrCreate(version);