diff --git a/site_utils/deployment/prepare/dut.py b/site_utils/deployment/prepare/dut.py
index d49d9f1..7ee0c3e 100644
--- a/site_utils/deployment/prepare/dut.py
+++ b/site_utils/deployment/prepare/dut.py
@@ -13,6 +13,7 @@
 from __future__ import print_function
 
 import contextlib
+import six
 import time
 
 import common
@@ -461,10 +462,10 @@
     _check_firmware_update_result(host, fw_update_log)
 
     try:
-        host.reboot()
+        try_reset_by_servo(host)
     except Exception as e:
         logging.debug('Failed to reboot the DUT after update firmware; %s', e)
-        try_reset_by_servo(host)
+        raise Exception('Failed to reboot the DUT after update firmware')
 
     # Once we confirmed DUT can boot from new firmware, get us out of
     # dev-mode and clear GBB flags.  GBB flags are non-zero because