From 334336232850e3bfc66d302d19a0aa8ade0c7b83 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Tue, 2 Oct 2012 07:35:10 -0700
Subject: [PATCH] Better to print an error message than to die with a npe.

---
 .../bridge/persist/dao/CloudStackConfigurationDaoImpl.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
index c49f612bb43..63330428159 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
@@ -52,7 +52,12 @@ public class CloudStackConfigurationDaoImpl extends GenericDaoBase<CloudStackCon
 			txn.start();
 			SearchCriteria<CloudStackConfigurationVO> sc = NameSearch.create();
 			sc.setParameters("name", name);
-			return findOneBy(sc).getValue();
+			CloudStackConfigurationVO configItem = findOneBy(sc);
+			if (configItem == null) {
+				s_logger.warn("No configuration item found with name " + name);
+				return null;
+			}
+			return configItem.getValue();
         }finally {
 		
 		}