diff --git a/server/src/com/cloud/storage/StorageManager.java b/server/src/com/cloud/storage/StorageManager.java
index d15c9b6a86f..7bb659387d3 100755
--- a/server/src/com/cloud/storage/StorageManager.java
+++ b/server/src/com/cloud/storage/StorageManager.java
@@ -23,6 +23,7 @@ import java.util.List;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.manager.Commands;
+import com.cloud.api.ServerApiException;
 import com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd;
 import com.cloud.api.commands.CreateStoragePoolCmd;
 import com.cloud.api.commands.CreateVolumeCmd;
@@ -311,17 +312,17 @@ public interface StorageManager extends Manager {
      * Enable maintenance for primary storage
      * @param cmd - the command specifying primaryStorageId
      * @return the primary storage pool
-     * @throws InvalidParameterValueException
+     * @throws ServerApiException
      */
-    public StoragePoolVO preparePrimaryStorageForMaintenance(PreparePrimaryStorageForMaintenanceCmd cmd) throws InvalidParameterValueException;
+    public StoragePoolVO preparePrimaryStorageForMaintenance(PreparePrimaryStorageForMaintenanceCmd cmd) throws ServerApiException;
     
     /**
      * Complete maintenance for primary storage
      * @param cmd - the command specifying primaryStorageId
      * @return the primary storage pool
-     * @throws InvalidParameterValueException
+     * @throws ServerApiException
      */
-    public StoragePoolVO cancelPrimaryStorageForMaintenance(CancelPrimaryStorageMaintenanceCmd cmd) throws InvalidParameterValueException;
+    public StoragePoolVO cancelPrimaryStorageForMaintenance(CancelPrimaryStorageMaintenanceCmd cmd) throws ServerApiException;
 
 	public StoragePoolVO updateStoragePool(UpdateStoragePoolCmd cmd) throws IllegalArgumentException;
     
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 580f9803a59..d474c0a237f 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -2141,7 +2141,7 @@ public class StorageManagerImpl implements StorageManager {
     }
     
     @Override @DB
-    public synchronized StoragePoolVO preparePrimaryStorageForMaintenance(PreparePrimaryStorageForMaintenanceCmd cmd) {
+    public synchronized StoragePoolVO preparePrimaryStorageForMaintenance(PreparePrimaryStorageForMaintenanceCmd cmd) throws ServerApiException{
     	Long primaryStorageId = cmd.getId();
     	Long userId = UserContext.current().getUserId();
         boolean restart = true;