From 68ce3f56ac9048071892ce47a1da984768fbde55 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren.s.shepherd@gmail.com>
Date: Wed, 6 Nov 2013 09:43:57 -0700
Subject: [PATCH] Missed a null check

---
 utils/src/com/cloud/utils/db/DbProperties.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utils/src/com/cloud/utils/db/DbProperties.java b/utils/src/com/cloud/utils/db/DbProperties.java
index a5ad383118d..55df23da08e 100644
--- a/utils/src/com/cloud/utils/db/DbProperties.java
+++ b/utils/src/com/cloud/utils/db/DbProperties.java
@@ -65,12 +65,15 @@ public class DbProperties {
                 if ( is == null ) {
                     is = PropertiesUtil.openStreamFromURL("db.properties");
                 }
+
                 if ( is == null ) {
                     System.err.println("Failed to find db.properties");
                     log.error("Failed to find db.properties");
                 }
 
-                dbProps.load(is);
+                if ( is != null ) {
+                    dbProps.load(is);
+                }
 
                 EncryptionSecretKeyChecker checker = new EncryptionSecretKeyChecker();
                 checker.check(dbProps);