1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/tradefed/targetprep/DeviceWiper.java b/src/com/android/tradefed/targetprep/DeviceWiper.java
index d916c364d..39957f649 100644
--- a/src/com/android/tradefed/targetprep/DeviceWiper.java
+++ b/src/com/android/tradefed/targetprep/DeviceWiper.java
@@ -59,7 +59,8 @@ public class DeviceWiper implements ITargetPreparer {
         CLog.d("Attempting fastboot wiping");
         CommandResult r = device.executeLongFastbootCommand("-w");
         if (r.getStatus() != CommandStatus.SUCCESS) {
-            throw new TargetSetupError(String.format("fastboot wiping failed: %s", r.getStderr()));
+            throw new TargetSetupError(String.format("fastboot wiping failed: %s", r.getStderr()),
+                    device.getDeviceDescriptor());
         }
     }
 
@@ -74,7 +75,7 @@ public class DeviceWiper implements ITargetPreparer {
         CommandResult r = device.executeLongFastbootCommand(op, partition);
         if (r.getStatus() != CommandStatus.SUCCESS) {
             throw new TargetSetupError(String.format("%s %s failed: %s", op, partition,
-                    r.getStderr()));
+                    r.getStderr()), device.getDeviceDescriptor());
         }
     }
 }