diff --git a/server/src/com/cloud/upgrade/DatabaseCreator.java b/server/src/com/cloud/upgrade/DatabaseCreator.java
index 99e63a673c0..4d706344707 100755
--- a/server/src/com/cloud/upgrade/DatabaseCreator.java
+++ b/server/src/com/cloud/upgrade/DatabaseCreator.java
@@ -156,7 +156,10 @@ public class DatabaseCreator {
             System.exit(1);
         }
 
-        Transaction.initDataSource(dbPropsFile);
+        try {
+            Transaction.initDataSource(dbPropsFile);
+        } catch (NullPointerException e) {
+        }
         initDB(dbPropsFile, rootPassword, databases, dryRun);
 
         // Process sql files