diff --git a/public/actions/remote_host_cf_device_factory.py b/public/actions/remote_host_cf_device_factory.py
index 257c581..6c96d04 100644
--- a/public/actions/remote_host_cf_device_factory.py
+++ b/public/actions/remote_host_cf_device_factory.py
@@ -120,8 +120,14 @@
 
         if error_msg:
             self._all_failures[instance] = error_msg
-        self._FindLogFiles(
-            instance, (error_msg and not self._avd_spec.no_pull_log))
+
+        try:
+            self._FindLogFiles(
+                instance, (error_msg and not self._avd_spec.no_pull_log))
+        except (errors.SubprocessFail, errors.DeviceConnectionError,
+                subprocess.CalledProcessError) as e:
+            logger.error("Fail to find log files: %s", e)
+
         return instance
 
     def _GetInstancePath(self, relative_path=""):
diff --git a/public/actions/remote_host_cf_device_factory_test.py b/public/actions/remote_host_cf_device_factory_test.py
index a4fa22c..49036ec 100644
--- a/public/actions/remote_host_cf_device_factory_test.py
+++ b/public/actions/remote_host_cf_device_factory_test.py
@@ -97,6 +97,8 @@
         factory = remote_host_cf_device_factory.RemoteHostDeviceFactory(
             mock_avd_spec, cvd_host_package_artifact="/mock/cvd.tar.gz")
 
+        mock_pull.PullLogs.side_effect = errors.DeviceConnectionError
+
         log = {"path": "/log.txt"}
         mock_cvd_utils.GetRemoteHostBaseDir.return_value = "acloud_cf_2"
         mock_cvd_utils.FormatRemoteHostInstanceName.return_value = "inst"
diff --git a/public/actions/remote_instance_cf_device_factory.py b/public/actions/remote_instance_cf_device_factory.py
index ba618c1..1fbab05 100644
--- a/public/actions/remote_instance_cf_device_factory.py
+++ b/public/actions/remote_instance_cf_device_factory.py
@@ -18,8 +18,10 @@
 import logging
 import os
 import shutil
+import subprocess
 import tempfile
 
+from acloud import errors
 from acloud.create import create_common
 from acloud.internal import constants
 from acloud.internal.lib import cvd_utils
@@ -71,9 +73,15 @@
         except Exception as e:
             self._SetFailures(instance, e)
 
-        self._FindLogFiles(
-            instance,
-            instance in self.GetFailures() and not self._avd_spec.no_pull_log)
+        try:
+            self._FindLogFiles(
+                instance,
+                (instance in self.GetFailures() and
+                 not self._avd_spec.no_pull_log))
+        except (errors.SubprocessFail, errors.DeviceConnectionError,
+                subprocess.CalledProcessError) as e:
+            logger.error("Fail to find log files: %s", e)
+
         return instance
 
     def _ProcessArtifacts(self):
diff --git a/public/actions/remote_instance_cf_device_factory_test.py b/public/actions/remote_instance_cf_device_factory_test.py
index 9d736a2..a658a12 100644
--- a/public/actions/remote_instance_cf_device_factory_test.py
+++ b/public/actions/remote_instance_cf_device_factory_test.py
@@ -21,6 +21,7 @@
 
 from unittest import mock
 
+from acloud import errors
 from acloud.create import avd_spec
 from acloud.internal import constants
 from acloud.internal.lib import android_build_client
@@ -245,6 +246,8 @@
         mock_cvd_utils.UploadExtraImages.return_value = [
             ("-boot_image", "/boot/img")]
 
+        mock_pull.PullLogs.side_effect = errors.DeviceConnectionError
+
         fake_host_package_name = "/fake/host_package.tar.gz"
         fake_image_name = ""
         factory = remote_instance_cf_device_factory.RemoteInstanceDeviceFactory(