diff --git a/configure b/configure
index e77dc237ff..a4bf70eecd 100755
--- a/configure
+++ b/configure
@@ -138,3 +138,4 @@ while test x$1 != x; do
 		;;
 	esac
 done
+exit 0
diff --git a/tools/devops/device-tests/templates/device-tests.yml b/tools/devops/device-tests/templates/device-tests.yml
index d8d1e14b33..4d4155c5f7 100644
--- a/tools/devops/device-tests/templates/device-tests.yml
+++ b/tools/devops/device-tests/templates/device-tests.yml
@@ -99,7 +99,17 @@ steps:
 
 # if we got to this point, it means that we do have at least 50 Gb to run the test, should
 # be more than enough, else the above script would have stopped the pipeline
-- bash: cd xamarin-macios && ./configure --enable-xamarin
+- bash: |
+    set -x
+    set -e
+    cd xamarin-macios
+    ./configure --enable-xamarin
+    if [[ $? = 0 ]]; then
+      echo "Xamarin private packages configured."
+    else
+      echo "Xamarin packages configuration failed."
+      echo "Configuration exit code $?"
+    fi
   displayName: 'Enable Xamarin'
   timeoutInMinutes: 1