1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/tradefed/targetprep/InstrumentationPreparer.java b/src/com/android/tradefed/targetprep/InstrumentationPreparer.java
index e9a1960a5..16a507d6b 100644
--- a/src/com/android/tradefed/targetprep/InstrumentationPreparer.java
+++ b/src/com/android/tradefed/targetprep/InstrumentationPreparer.java
@@ -98,7 +98,7 @@ public class InstrumentationPreparer implements ITargetPreparer {
             return;
         }
 
-        BuildError e = new BuildError("unknown error");
+        BuildError e = new BuildError("unknown error", device.getDeviceDescriptor());
         for (int i = 0; i < mAttempts; i++) {
             try {
                 runInstrumentation(device);
@@ -139,7 +139,7 @@ public class InstrumentationPreparer implements ITargetPreparer {
             String msg = String.format("Failed to run instrumentation %s on %s. failed tests = %s",
                     mPackageName, device.getSerialNumber(), getFailedTestNames(listener));
             CLog.w(msg);
-            throw new BuildError(msg);
+            throw new BuildError(msg, device.getDeviceDescriptor());
         }
     }