diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java b/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java
index 3db14d8bcb5..58703ae898a 100755
--- a/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java
+++ b/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java
@@ -169,6 +169,12 @@ public class DatabaseCreator {
             System.exit(1);
         }
 
+        try {
+            TransactionLegacy.initDataSource(dbPropsFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
         initDB(dbPropsFile, rootPassword, databases, dryRun);
 
         // Process sql files
diff --git a/framework/db/src/com/cloud/utils/db/TransactionLegacy.java b/framework/db/src/com/cloud/utils/db/TransactionLegacy.java
index 7cb4a985448..a874ce10a56 100755
--- a/framework/db/src/com/cloud/utils/db/TransactionLegacy.java
+++ b/framework/db/src/com/cloud/utils/db/TransactionLegacy.java
@@ -1025,8 +1025,10 @@ public class TransactionLegacy {
     public static void initDataSource(String propsFileName) throws IOException {
         Properties dbProps = new Properties();
         File dbPropsFile = PropertiesUtil.findConfigFile(propsFileName);
-        PropertiesUtil.loadFromFile(dbProps, dbPropsFile);
-        initDataSource(dbProps);
+        if (dbPropsFile != null && dbPropsFile.exists()) {
+            PropertiesUtil.loadFromFile(dbProps, dbPropsFile);
+            initDataSource(dbProps);
+        }
     }
 
     public static void initDataSource(Properties dbProps) {