diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb
index b0755fec5f..128c994093 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb
@@ -47,8 +47,12 @@ class VIClient
     end
 
     def load_vcenter_configuration
-        vcenter_conf = YAML::load(File.open("#{ETC_LOCATION}/vcenter_driver.conf"))
-        vcenter_conf
+        begin
+            vcenter_conf = YAML::load(File.open("#{ETC_LOCATION}/vcenter_driver.conf"))
+            vcenter_conf
+        rescue
+            Hash.new
+        end
     end
 
     def get_property_vcenter_conf(key)
diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
index a6784feacc..89df2ed06d 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
@@ -1488,6 +1488,7 @@ class VirtualMachine < Template
     # process that uses this method
     def wait_deploy_timeout
         timeout_deploy = @vi_client.get_property_vcenter_conf(:vm_poweron_wait_default)
+        timeout_deploy = 300 if timeout_deploy.nil?
         time_start = Time.now
         begin
             time_running = Time.now - time_start