From 1d74daf6fe7c87931b6308d4e2e0e39f109a85ac Mon Sep 17 00:00:00 2001
From: Mike Tutkowski <mike.tutkowski@solidfire.com>
Date: Mon, 10 Mar 2014 11:42:56 -0600
Subject: [PATCH] CLOUDSTACK-6170

---
 .../cloudstack/engine/orchestration/CloudOrchestrator.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
index 7969e43cdc5..fc1b85c0802 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
@@ -188,7 +188,7 @@ public class CloudOrchestrator implements OrchestrationService {
         rootDiskOfferingInfo.setDiskOffering(offering);
         rootDiskOfferingInfo.setSize(rootDiskSize);
 
-        if (offering.isCustomizedIops()) {
+        if (offering.isCustomizedIops() != null && offering.isCustomizedIops()) {
             Map<String, String> userVmDetails = _userVmDetailsDao.listDetailsKeyPairs(vm.getId());
 
             if (userVmDetails != null) {