diff --git a/src/im_mad/remotes/lib/firecracker.rb b/src/im_mad/remotes/lib/firecracker.rb
index 717c24043f..de862ecbcb 100644
--- a/src/im_mad/remotes/lib/firecracker.rb
+++ b/src/im_mad/remotes/lib/firecracker.rb
@@ -67,7 +67,7 @@ module Firecracker
 
             response = client.get('machine-config')
         rescue StandardError, FirecrackerError
-            return
+            return {}
         end
 
         ###################################################################
@@ -89,7 +89,7 @@ module Firecracker
 
             response = client.get('')
         rescue StandardError, FirecrackerError
-            return
+            return {}
         end
 
         ###################################################################
diff --git a/src/im_mad/remotes/node-probes.d/monitor_ds.rb b/src/im_mad/remotes/node-probes.d/monitor_ds.rb
index 12653faa23..673d27194b 100755
--- a/src/im_mad/remotes/node-probes.d/monitor_ds.rb
+++ b/src/im_mad/remotes/node-probes.d/monitor_ds.rb
@@ -23,7 +23,11 @@ require 'fileutils'
 class DSMonitor
 
     def initialize(config)
-        @ds_location = config.elements['DATASTORE_LOCATION'].text.to_s
+        begin
+            @ds_location = config.elements['DATASTORE_LOCATION'].text.to_s
+        rescue
+        end
+
         @ds_location ||= '/var/lib/one/datastores'
 
         FileUtils.mkdir_p @ds_location
diff --git a/src/im_mad/remotes/node-probes.d/monitor_ds_vm.rb b/src/im_mad/remotes/node-probes.d/monitor_ds_vm.rb
index f8a9668b36..fd134ee79b 100755
--- a/src/im_mad/remotes/node-probes.d/monitor_ds_vm.rb
+++ b/src/im_mad/remotes/node-probes.d/monitor_ds_vm.rb
@@ -27,7 +27,11 @@ rescue StandardError => e
     exit(-1)
 end
 
+begin
 ds_location = config.elements['DATASTORE_LOCATION'].text.to_s
+rescue
+end
+
 ds_location ||= '/var/lib/one/datastores'
 
 Dir.chdir ds_location