diff --git a/scripts/aws-device-farm/aws-device-farm-run.sh b/scripts/aws-device-farm/aws-device-farm-run.sh
index 95a6c856c..d4220ce9b 100755
--- a/scripts/aws-device-farm/aws-device-farm-run.sh
+++ b/scripts/aws-device-farm/aws-device-farm-run.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+set -o xtrace
 
 # List of required environment variables
 required_vars=(
@@ -87,6 +88,14 @@ arn="$(aws devicefarm schedule-run \
   --execution-configuration videoCapture=false \
   --output text --query run.arn)"
 
+echo ARN: $arn  >&2
+
+if [ -z "$arn" ]; then
+  echo "Error: Failed to schedule Device Farm run or got empty ARN" >&2
+  exit 1
+fi
+
+
 echo "$arn"
 
 if [[ "$wait_for_completion" != "true" ]]; then