diff --git a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
index 525aa709046..de98f55be6f 100644
--- a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
@@ -152,11 +152,13 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
                 }
 
                 if (canHandleSrc) {
-                    // return handleCreateVolumeFromSnapshotOnlySourceOnStorageSystem();
+                    throw new UnsupportedOperationException("This operation is not supported (DataStoreCapabilities.STORAGE_SYSTEM_SNAPSHOT " +
+                            "not supported by destination storage plug-in).");
                 }
 
                 if (canHandleDest) {
-                    // return handleCreateVolumeFromSnapshotOnlyDestinationOnStorageSystem();
+                    throw new UnsupportedOperationException("This operation is not supported (DataStoreCapabilities.STORAGE_SYSTEM_SNAPSHOT " +
+                            "not supported by source storage plug-in).");
                 }
             }
         }