diff --git a/lib/beaker/hypervisor/vsphere_helper.rb b/lib/beaker/hypervisor/vsphere_helper.rb
index 7331374..02b5b04 100644
--- a/lib/beaker/hypervisor/vsphere_helper.rb
+++ b/lib/beaker/hypervisor/vsphere_helper.rb
@@ -106,8 +106,8 @@ def find_vms(names, connection = @connection)
   end
 
   def find_datastore(dc, datastorename)
-    datacenter = @connection.serviceInstance.find_datacenter(dc)
-    datacenter.find_datastore(datastorename)
+    datacenter = @connection.serviceInstance.find_datacenter(dc) || raise("datacenter #{dc} not found")
+    datacenter.find_datastore(datastorename) || raise("datastore #{datastorename} not found")
   end
 
   def find_folder(dc, foldername)