diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
index 51ea2126756..a0c991b5ad6 100644
--- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
+++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
@@ -532,8 +532,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements
             throw new CloudRuntimeException("Failed to delete storage pool on host");
         }
         
-        this.dataStoreHelper.deletePrimaryDataStore(store);
-        return false;
+        return this.dataStoreHelper.deletePrimaryDataStore(store);
     }
 
     @Override
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 4e410e4b41e..a182e39dd86 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -963,9 +963,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
         DataStoreLifeCycle lifeCycle = storeProvider.getDataStoreLifeCycle();
         DataStore store = dataStoreMgr.getDataStore(
                 sPool.getId(), DataStoreRole.Primary);
-        lifeCycle.deleteDataStore(store);
-
-        return false;
+        return lifeCycle.deleteDataStore(store);
     }
 
     @Override