diff --git a/meta-google/recipes-google/networking/google-usb-network/usb_network.sh b/meta-google/recipes-google/networking/google-usb-network/usb_network.sh
index 6f2c4d5..3c38fb4 100755
--- a/meta-google/recipes-google/networking/google-usb-network/usb_network.sh
+++ b/meta-google/recipes-google/networking/google-usb-network/usb_network.sh
@@ -185,5 +185,8 @@
 if [[ $ACTION == "stop" ]]; then
     gadget_stop
 else
-    gadget_start
+    rc=0
+    gadget_start || rc=$?
+    (( rc == 0 )) || gadget_stop || true
+    exit $rc
 fi