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 {
 		
 		}