diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 727f9868f1..3d284c1a02 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -1532,7 +1532,7 @@ static int get_datastore_requirements(Template *tmpl, set<int>& ds_ids,
 
             int rc = check_and_set_datastores_id(csystem_ds, ds_ids);
 
-            if ( rc != 0 )
+            if ( rc == -1 )
             {
                 incomp_id = i;
                 goto error_disk;
@@ -1576,6 +1576,11 @@ int VirtualMachine::automatic_requirements(set<int>& cluster_ids,
 
     rc = get_datastore_requirements(obj_template, datastore_ids, error_str);
 
+    if (rc == -1)
+    {
+        return -1;
+    }
+
     if ( !cluster_ids.empty() )
     {
         set<int>::iterator i = cluster_ids.begin();