diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index 1f12a1004c..6adea3c03e 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -297,7 +297,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         vm.info
         ids = vm.retrieve_elements("/VM/SNAPSHOTS/SNAPSHOT[NAME='#{id}']/ID")
 
-        return [-1, "#{id} not found or duplicated"] \
+        return [-1, "Snapshot #{id} not found or duplicated"] \
                 if ids.nil? || ids.size > 1
 
         [0, ids[0].to_i]
diff --git a/src/cli/onevm b/src/cli/onevm
index 05255a1d31..d59c8f0f2a 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -472,7 +472,13 @@ CommandParser::CmdParser.new(ARGV) do
             verbose = "disk #{disk_id} prepared to be saved in " \
                       "the image #{image_name}"
         else
-            snapshot_id = snapshot_id.to_i
+            err, snapshot_id = helper.retrieve_disk_snapshot_id(args[0],
+                                                                snapshot_id)
+
+            if err == -1
+                STDERR.puts snapshot_id
+                exit(-1)
+            end
 
             verbose = "disk #{disk_id} snapshot #{snapshot_id} prepared to " \
                       "be saved in the image #{image_name}"
diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
index 3aa69c744e..89d5e023c4 100644
--- a/src/dm/DispatchManagerActions.cc
+++ b/src/dm/DispatchManagerActions.cc
@@ -2016,7 +2016,7 @@ int DispatchManager::disk_snapshot_revert(int vid, int did, int snap_id,
     if (vm->set_snapshot_disk(did, snap_id) == -1)
     {
         oss << "Disk id (" << did << ") or snapshot id ("
-            << snap_id << ") is not invalid.";
+            << snap_id << ") is not valid.";
 
         error_str = oss.str();